--- heimdal-0.6.3.orig/cf/krb-com_err.m4
+++ heimdal-0.6.3/cf/krb-com_err.m4
@@ -0,0 +1,35 @@
+dnl
+dnl Tests for readline functions
+dnl
+
+dnl el_init
+
+AC_DEFUN(KRB_COM_ERR,[
+dnl com_err
+
+ac_foo=no
+if test "$with_com_err" = yes; then
+	COMPILE_ET='compile_et'
+#elif test "$ac_cv_func_com_err" = yes; then
+#	COMPILE_ET='compile_et'
+else
+	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
+	DIR_com_err="com_err"
+	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
+fi
+
+if true; then
+#	!FIXME! why doesn't built in version of com_err work?
+	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
+	DIR_com_err="com_err"
+	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
+fi
+
+#if test "$com_err_libdir"; then
+#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
+#fi
+AC_DEFINE(HAVE_COM_ERR, 1, 
+	[Define if you have a com_err compatible library.])dnl
+
+])
+AC_SUBST(COMPILE_ET)
--- heimdal-0.6.3.orig/cf/krb-ss.m4
+++ heimdal-0.6.3/cf/krb-ss.m4
@@ -0,0 +1,36 @@
+dnl
+dnl Tests for readline functions
+dnl
+
+dnl el_init
+
+AC_DEFUN(KRB_SS,[
+dnl com_err
+
+ac_foo=no
+if test "$with_ss" = yes; then
+	LIB_sl="$LIB_ss"
+else
+	DIR_ss="sl"
+	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
+	LIB_ss='$(top_builddir)/lib/sl/libss.la'
+	INCLUDE_ss='-I$(top_builddir)/include/sl'
+fi
+
+
+#if test "$ss_libdir"; then
+#	LIB_ss="-rpath $sl_libdir $LIB_ss"
+#fi
+
+if true; then
+#	!FIXME! why doesn't built in version of ss work?
+	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
+	LIB_ss='$(top_builddir)/lib/sl/libss.la'
+	INCLUDE_ss='-I$(top_builddir)/include/ss'
+fi
+
+AC_DEFINE(HAVE_SS, 1, 
+	[Define if you have a ss compatible library.])dnl
+
+])
+AC_SUBST(LIB_sl)
--- heimdal-0.6.3.orig/debian/patches/034_CVE-2006-0582
+++ heimdal-0.6.3/debian/patches/034_CVE-2006-0582
@@ -0,0 +1,63 @@
+diff -u -p -Nr --exclude CVS heimdal-0.6.3.orig/appl/rsh/rshd.c heimdal-0.6.3/appl/rsh/rshd.c
+--- heimdal-0.6.3.orig/appl/rsh/rshd.c	2003-08-19 13:36:17.000000000 +0200
++++ heimdal-0.6.3/appl/rsh/rshd.c	2006-02-14 07:19:22.000000000 +0100
+@@ -802,34 +802,6 @@ doit (void)
+     }
+ #endif
+     
+-
+-#ifdef KRB5
+-    {
+-	int fd;
+- 
+-	if (!do_unique_tkfile)
+-	    snprintf(tkfile,sizeof(tkfile),"FILE:/tmp/krb5cc_%u",pwd->pw_uid);
+-	else if (*tkfile=='\0') {
+-	    snprintf(tkfile,sizeof(tkfile),"FILE:/tmp/krb5cc_XXXXXX");
+-	    fd = mkstemp(tkfile+5);
+-	    close(fd);
+-	    unlink(tkfile+5);
+-	}
+- 
+-	if (kerberos_status)
+-	    krb5_start_session();
+-    }
+-    chown(tkfile + 5, pwd->pw_uid, -1);
+-
+-#if defined(DCE)
+-    if (kerberos_status) {
+-	esetenv("KRB5CCNAME", tkfile, 1);
+-	dfspag = krb5_dfs_pag(context, kerberos_status, user_ticket->client, server_user);
+-    }
+-#endif
+-
+-#endif
+-
+ #ifdef HAVE_SETLOGIN
+     if (setlogin(pwd->pw_name) < 0)
+ 	syslog(LOG_ERR, "setlogin() failed: %m");
+@@ -858,6 +830,24 @@ doit (void)
+ 	close (errsock);
+     }
+ 
++#ifdef KRB5
++    {
++	int fd;
++ 
++	if (!do_unique_tkfile)
++	    snprintf(tkfile,sizeof(tkfile),"FILE:/tmp/krb5cc_%u",pwd->pw_uid);
++	else if (*tkfile=='\0') {
++	    snprintf(tkfile,sizeof(tkfile),"FILE:/tmp/krb5cc_XXXXXX");
++	    fd = mkstemp(tkfile+5);
++	    close(fd);
++	    unlink(tkfile+5);
++	}
++ 
++	if (kerberos_status)
++	    krb5_start_session();
++    }
++#endif
++
+     setup_environment (&env, pwd);
+ 
+     if (do_encrypt) {
--- heimdal-0.6.3.orig/debian/patches/033_CAN-2005-2040
+++ heimdal-0.6.3/debian/patches/033_CAN-2005-2040
@@ -0,0 +1,82 @@
+diff -u -p -Nr --exclude CVS heimdal-0.6.3.orig/appl/telnet/telnetd/ext.h heimdal-0.6.3/appl/telnet/telnetd/ext.h
+--- heimdal-0.6.3.orig/appl/telnet/telnetd/ext.h	2001-08-29 02:45:22.000000000 +0200
++++ heimdal-0.6.3/appl/telnet/telnetd/ext.h	2005-07-06 10:16:31.000000000 +0200
+@@ -57,7 +57,7 @@ extern const char *new_login;
+ 
+ extern slcfun	slctab[NSLC + 1];	/* slc mapping table */
+ 
+-extern char	*terminaltype;
++extern char	terminaltype[41];
+ 
+ /*
+  * I/O data buffers, pointers, and counters.
+diff -u -p -Nr --exclude CVS heimdal-0.6.3.orig/appl/telnet/telnetd/global.c heimdal-0.6.3/appl/telnet/telnetd/global.c
+--- heimdal-0.6.3.orig/appl/telnet/telnetd/global.c	2001-07-19 18:00:42.000000000 +0200
++++ heimdal-0.6.3/appl/telnet/telnetd/global.c	2005-07-06 10:16:31.000000000 +0200
+@@ -54,7 +54,7 @@ int	require_otp;
+ 
+ slcfun	slctab[NSLC + 1];	/* slc mapping table */
+ 
+-char	*terminaltype;
++char	terminaltype[41];
+ 
+ /*
+  * I/O data buffers, pointers, and counters.
+diff -u -p -Nr --exclude CVS heimdal-0.6.3.orig/appl/telnet/telnetd/state.c heimdal-0.6.3/appl/telnet/telnetd/state.c
+--- heimdal-0.6.3.orig/appl/telnet/telnetd/state.c	2004-06-21 10:21:58.000000000 +0200
++++ heimdal-0.6.3/appl/telnet/telnetd/state.c	2005-07-06 10:16:31.000000000 +0200
+@@ -939,7 +939,7 @@ suboption(void)
+     }  /* end of case TELOPT_TSPEED */
+ 
+     case TELOPT_TTYPE: {		/* Yaaaay! */
+-	static char terminalname[41];
++	char *p;
+ 
+ 	if (his_state_is_wont(TELOPT_TTYPE))	/* Ignore if option disabled */
+ 	    break;
+@@ -949,9 +949,9 @@ suboption(void)
+ 	    return;		/* ??? XXX but, this is the most robust */
+ 	}
+ 
+-	terminaltype = terminalname;
++	p = terminaltype;
+ 
+-	while ((terminaltype < (terminalname + sizeof terminalname-1)) &&
++	while ((p < (terminaltype + sizeof terminaltype-1)) &&
+ 	       !SB_EOF()) {
+ 	    int c;
+ 
+@@ -959,10 +959,9 @@ suboption(void)
+ 	    if (isupper(c)) {
+ 		c = tolower(c);
+ 	    }
+-	    *terminaltype++ = c;    /* accumulate name */
++	    *p++ = c;    /* accumulate name */
+ 	}
+-	*terminaltype = 0;
+-	terminaltype = terminalname;
++	*p = 0;
+ 	break;
+     }  /* end of case TELOPT_TTYPE */
+ 
+diff -u -p -Nr --exclude CVS heimdal-0.6.3.orig/appl/telnet/telnetd/telnetd.c heimdal-0.6.3/appl/telnet/telnetd/telnetd.c
+--- heimdal-0.6.3.orig/appl/telnet/telnetd/telnetd.c	2004-03-22 19:17:25.000000000 +0100
++++ heimdal-0.6.3/appl/telnet/telnetd/telnetd.c	2005-07-06 10:16:31.000000000 +0200
+@@ -636,7 +636,7 @@ getterminaltype(char *name, size_t name_
+ 		     */
+ 		    _gettermname();
+ 		    if (strncmp(first, terminaltype, sizeof(first)) != 0)
+-			strcpy(terminaltype, first);
++			strlcpy(terminaltype, first, sizeof(terminaltype));
+ 		    break;
+ 		}
+ 	    }
+@@ -752,7 +752,7 @@ Please contact your net administrator");
+      */
+     *user_name = 0;
+     level = getterminaltype(user_name, sizeof(user_name));
+-    esetenv("TERM", terminaltype ? terminaltype : "network", 1);
++    esetenv("TERM", terminaltype[0] ? terminaltype : "network", 1);
+ 
+ #ifdef _SC_CRAY_SECURE_SYS
+     if (secflag) {
--- heimdal-0.6.3.orig/debian/patches/011_sharedlibs
+++ heimdal-0.6.3/debian/patches/011_sharedlibs
@@ -0,0 +1,43 @@
+diff -ruN heimdal-0.6.3-old/lib/editline/Makefile.am heimdal-0.6.3/lib/editline/Makefile.am
+--- heimdal-0.6.3-old/lib/editline/Makefile.am	Wed Nov 15 10:22:29 2000
++++ heimdal-0.6.3/lib/editline/Makefile.am	Thu Nov 15 11:59:31 2001
+@@ -38,13 +38,13 @@
+ 	unix.h \
+ 	$(EXTRA_SOURCE)
+ 
+-libeditline_la_LDFLAGS = -static
++libeditline_la_LDFLAGS = -no-undefined
+ 
+ EXTRA_SOURCE = $(ES) 
+ 
+ libel_compat_la_SOURCES = edit_compat.c
+ 
+-libel_compat_la_LDFLAGS = -static
++libel_compat_la_LDFLAGS = -no-undefined
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
+diff -ruN heimdal-0.6.3-old/tools/krb5-config.in heimdal-0.6.3/tools/krb5-config.in
+--- heimdal-0.6.3-old/tools/krb5-config.in	Mon Jan 29 17:56:51 2001
++++ heimdal-0.6.3/tools/krb5-config.in	Thu Nov 15 11:59:31 2001
+@@ -89,6 +89,9 @@
+ if test "$do_libs" = "yes"; then
+     lib_flags="-L${libdir}"
+     case $library in
++    krb5)
++	lib_flags="$lib_flags -lkrb5"
++	;;
+     gssapi)
+ 	lib_flags="$lib_flags -lgssapi"
+ 	;;
+@@ -99,8 +102,8 @@
+ 	lib_flags="$lib_flags -lkadm5srv"
+ 	;;
+     esac
+-    lib_flags="$lib_flags -lkrb5 -lasn1 @LIB_des_appl@ -lroken"
+-    lib_flags="$lib_flags @LIB_crypt@ @LIB_dbopen@ @LIBS@"
++#    lib_flags="$lib_flags -lkrb5 -lasn1 @LIB_des_appl@ -lroken"
++#    lib_flags="$lib_flags @LIB_crypt@ @LIB_dbopen@ @LIBS@"
+     echo $lib_flags
+ fi
+ if test "$do_cflags" = "yes"; then
--- heimdal-0.6.3.orig/debian/patches/035_CVE-2006-0677
+++ heimdal-0.6.3/debian/patches/035_CVE-2006-0677
@@ -0,0 +1,39 @@
+diff -u -p -Nr --exclude CVS heimdal-0.6.3.orig/appl/telnet/telnetd/telnetd.c heimdal-0.6.3/appl/telnet/telnetd/telnetd.c
+--- heimdal-0.6.3.orig/appl/telnet/telnetd/telnetd.c	2006-02-14 07:02:47.000000000 +0100
++++ heimdal-0.6.3/appl/telnet/telnetd/telnetd.c	2006-02-14 07:19:22.000000000 +0100
+@@ -747,6 +747,15 @@ Please contact your net administrator");
+ #endif
+ 
+     init_env();
++
++    /* begin server processing */
++
++    /*
++     * Initialize the slc mapping table.
++     */
++
++    get_slc_defaults();
++
+     /*
+      * get terminal type.
+      */
+@@ -763,7 +772,6 @@ Please contact your net administrator");
+     }
+ #endif	/* _SC_CRAY_SECURE_SYS */
+ 
+-    /* begin server processing */
+     my_telnet(net, ourpty, remote_host_name, remote_utmp_name,
+ 	      level, user_name);
+     /*NOTREACHED*/
+@@ -803,11 +811,6 @@ my_telnet(int f, int p, const char *host
+     time_t timeout;
+ 
+     /*
+-     * Initialize the slc mapping table.
+-     */
+-    get_slc_defaults();
+-
+-    /*
+      * Do some tests where it is desireable to wait for a response.
+      * Rather than doing them slowly, one at a time, do them all
+      * at once.
--- heimdal-0.6.3.orig/debian/patches/020_maintainermode
+++ heimdal-0.6.3/debian/patches/020_maintainermode
@@ -0,0 +1,11 @@
+diff -ruN heimdal-0.6.3-old/configure.in heimdal-0.6.3/configure.in
+--- heimdal-0.6.3-old/configure.in	2004-09-13 15:16:55.000000000 +1000
++++ heimdal-0.6.3/configure.in	2004-09-13 15:28:15.000000000 +1000
+@@ -3,6 +3,7 @@
+ AC_PREREQ(2.53)
+ ##test -z "$CFLAGS" && CFLAGS="-g"
+ AC_INIT([Heimdal], [0.6.3], [heimdal-bugs@pdc.kth.se])
++AM_MAINTAINER_MODE
+ AC_CONFIG_SRCDIR([kuser/kinit.c])
+ AM_CONFIG_HEADER(include/config.h)
+ 
--- heimdal-0.6.3.orig/debian/patches/012_sharedlibs
+++ heimdal-0.6.3/debian/patches/012_sharedlibs
@@ -0,0 +1,342 @@
+diff -ruN heimdal-0.6.3-old/admin/Makefile.am heimdal-0.6.3/admin/Makefile.am
+--- heimdal-0.6.3-old/admin/Makefile.am	Tue Aug 28 18:31:19 2001
++++ heimdal-0.6.3/admin/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -24,6 +24,6 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_sl) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+diff -ruN heimdal-0.6.3-old/appl/otp/Makefile.am heimdal-0.6.3/appl/otp/Makefile.am
+--- heimdal-0.6.3-old/appl/otp/Makefile.am	Tue Aug 28 18:31:21 2001
++++ heimdal-0.6.3/appl/otp/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -12,4 +12,4 @@
+ man_MANS = otp.1  otpprint.1
+ 
+ LDADD = \
+-	$(top_builddir)/lib/otp/libotp.la
++	$(LIB_otp)
+diff -ruN heimdal-0.6.3-old/cf/Makefile.am.common heimdal-0.6.3/cf/Makefile.am.common
+--- heimdal-0.6.3-old/cf/Makefile.am.common	Fri May  9 03:08:09 2003
++++ heimdal-0.6.3/cf/Makefile.am.common	Thu Aug 28 15:37:16 2003
+@@ -57,6 +57,17 @@
+ INCLUDE_readline = @INCLUDE_readline@
+ LIB_readline = @LIB_readline@
+ 
++INCLUDE_roken = @INCLUDES_roken@
++LIB_roken = @LIB_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++INCLUDE_sl = @INCLUDE_sl@
++LIB_sl = @LIB_sl@
++INCLUDE_ss = @INCLUDE_ss@
++LIB_ss = @LIB_ss@
++INCLUDE_otp = @INCLUDE_otp@
++LIB_otp = @LIB_otp@
++
+ LEXLIB = @LEXLIB@
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/cf/krb-readline.m4 heimdal-0.6.3/cf/krb-readline.m4
+--- heimdal-0.6.3-old/cf/krb-readline.m4	Thu Aug 29 12:22:32 2002
++++ heimdal-0.6.3/cf/krb-readline.m4	Thu Aug 28 15:37:16 2003
+@@ -28,8 +28,10 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)"
+ else
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)"
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+diff -ruN heimdal-0.6.3-old/cf/otp.m4 heimdal-0.6.3/cf/otp.m4
+--- heimdal-0.6.3-old/cf/otp.m4	Mon May 20 06:51:08 2002
++++ heimdal-0.6.3/cf/otp.m4	Thu Aug 28 15:37:16 2003
+@@ -18,8 +18,6 @@
+ fi
+ if test "$enable_otp" = yes; then
+ 	AC_DEFINE(OTP, 1, [Define if you want OTP support in applications.])
+-	LIB_otp='$(top_builddir)/lib/otp/libotp.la'
+-	AC_SUBST(LIB_otp)
+ fi
+ AC_MSG_CHECKING([whether to enable OTP library])
+ AC_MSG_RESULT($enable_otp)
+diff -ruN heimdal-0.6.3-old/cf/roken-frag.m4 heimdal-0.6.3/cf/roken-frag.m4
+--- heimdal-0.6.3-old/cf/roken-frag.m4	Thu Dec 19 04:34:25 2002
++++ heimdal-0.6.3/cf/roken-frag.m4	Thu Aug 28 15:37:16 2003
+@@ -8,9 +8,9 @@
+ 
+ AC_REQUIRE([rk_CONFIG_HEADER])
+ 
+-DIR_roken=roken
+-LIB_roken='$(top_builddir)/$1/libroken.la'
+-INCLUDES_roken='-I$(top_builddir)/$1 -I$(top_srcdir)/$1'
++dnl DIR_roken=roken
++dnl LIB_roken='$(top_builddir)/$1/libroken.la'
++dnl INCLUDES_roken='-I$(top_builddir)/$1 -I$(top_srcdir)/$1'
+ 
+ dnl Checks for programs
+ AC_REQUIRE([AC_PROG_CC])
+@@ -643,9 +643,9 @@
+ dnl moved to AC_OUTPUT in configure.in
+ dnl AC_CONFIG_FILES($1/Makefile)
+ 
+-LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++dnl LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+-AC_SUBST(DIR_roken)dnl
+-AC_SUBST(LIB_roken)dnl
+-AC_SUBST(INCLUDES_roken)dnl
++dnl AC_SUBST(DIR_roken)dnl
++dnl AC_SUBST(LIB_roken)dnl
++dnl AC_SUBST(INCLUDES_roken)dnl
+ ])
+diff -ruN heimdal-0.6.3-old/cf/roken.m4 heimdal-0.6.3/cf/roken.m4
+--- heimdal-0.6.3-old/cf/roken.m4	Wed May  1 02:46:33 2002
++++ heimdal-0.6.3/cf/roken.m4	Thu Aug 28 15:37:16 2003
+@@ -34,10 +34,10 @@
+ 
+ AC_TRY_CPP(
+ [#include <roken.h>
+-#if ROKEN_VERSION < $1
+-#error old roken version, should be $1
+-fail
+-#endif
++//#if ROKEN_VERSION < $1
++//#error old roken version, should be $1
++//fail
++//#endif
+ ],[roken_installed=yes; break])
+ 
+ AC_MSG_RESULT($roken_installed)
+@@ -50,12 +50,13 @@
+   DIR_roken="roken"
+   LIB_roken='$4'
+   CPPFLAGS_roken='$5'
+-  AC_CONFIG_SUBDIRS(lib/roken)
++dnl  AC_CONFIG_SUBDIRS(lib/roken)
+ else
+   LIB_roken="$i/lib/libroken.la"
+   CPPFLAGS_roken="-I$i/include"
+ fi
+ 
++AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl
+ LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+ AC_SUBST(LIB_roken)dnl
+diff -ruN heimdal-0.6.3-old/cf/test-package.m4 heimdal-0.6.3/cf/test-package.m4
+--- heimdal-0.6.3-old/cf/test-package.m4	Wed Sep 11 01:23:38 2002
++++ heimdal-0.6.3/cf/test-package.m4	Thu Aug 28 15:37:16 2003
+@@ -37,7 +37,7 @@
+ 
+ header_dirs=
+ lib_dirs=
+-for i in $d; do
++for i in $d /usr; do
+ 	if test "$with_$1_include" = ""; then
+ 		if test -d "$i/include/$1"; then
+ 			header_dirs="$header_dirs $i/include/$1"
+@@ -100,6 +100,7 @@
+ 			AC_TRY_LINK([$2],,lres=$i;break)
+ 		done
+ 		if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
++			DIR_$1=
+ 			INCLUDE_$1="-I$ires"
+ 			LIB_$1="-L$lres $3 $4"
+ 			found=yes
+@@ -115,11 +116,13 @@
+ 	with_$1=yes
+ else
+ 	with_$1=no
++	DIR_$1=
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	AC_MSG_RESULT(no)
+ fi
+ 
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+diff -ruN heimdal-0.6.3-old/configure.in heimdal-0.6.3/configure.in
+--- heimdal-0.6.3-old/configure.in	Tue May 13 01:26:39 2003
++++ heimdal-0.6.3/configure.in	Thu Aug 28 15:37:16 2003
+@@ -187,9 +187,10 @@
+ 
+ rk_DB
+ 
+-dnl AC_ROKEN(10,[/usr/heimdal /usr/athena],[lib/roken],[$(top_builddir)/lib/roken/libroken.la],[-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken])
+-
+-rk_ROKEN(lib/roken)
++AC_ROKEN(10,[/usr/heimdal /usr/athena],[lib/roken],[$(top_builddir)/lib/roken/libroken.la],[-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken])
++#if ! test "$roken_installed" = yes; then
++	rk_ROKEN(lib/roken)
++#fi
+ LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken"
+ 
+ rk_OTP
+@@ -209,6 +210,26 @@
+  #include <readline.h>],-lreadline,,, READLINE)
+ 
+ rk_TEST_PACKAGE(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
++
++rk_TEST_PACKAGE(sl,,-lsl,,,SL)
++if ! test "$with_sl" = yes; then
++	DIR_sl="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++fi
++rk_TEST_PACKAGE(ss,,-lss,,,SS)
++if ! test "$with_sl" = yes; then
++	DIR_sl="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	DIR_ss=""
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++fi
++if test "$enable_otp" = "yes"; then
++  rk_TEST_PACKAGE(otp,,-lotp,,,OTP)
++  if ! test "$with_otp" = yes; then
++	DIR_otp="otp"
++ 	LIB_otp='$(top_builddir)/lib/otp/libotp.la'
++  fi
++fi
+ 
+ KRB_C_BIGENDIAN
+ AC_C_INLINE
+diff -ruN heimdal-0.6.3-old/kadmin/Makefile.am heimdal-0.6.3/kadmin/Makefile.am
+--- heimdal-0.6.3-old/kadmin/Makefile.am	Tue Aug 28 18:31:26 2001
++++ heimdal-0.6.3/kadmin/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -62,7 +62,7 @@
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_sl) \
+ 	$(LIB_readline) \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+diff -ruN heimdal-0.6.3-old/lib/Makefile.am heimdal-0.6.3/lib/Makefile.am
+--- heimdal-0.6.3-old/lib/Makefile.am	Wed Aug 29 04:44:41 2001
++++ heimdal-0.6.3/lib/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -5,12 +5,9 @@
+ if KRB4
+ dir_45 = 45
+ endif
+-if OTP
+-dir_otp = otp
+-endif
+ if DCE
+ dir_dce = kdfs
+ endif
+ 
+-SUBDIRS = @DIR_roken@ vers editline @DIR_com_err@ sl asn1 @DIR_des@ krb5 \
+-	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
++SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_sl@ asn1 @DIR_des@ krb5 \
++	kafs hdb kadm5 gssapi auth $(dir_45) @DIR_otp@ $(dir_dce)
+diff -ruN heimdal-0.6.3-old/lib/auth/afskauthlib/Makefile.am heimdal-0.6.3/lib/auth/afskauthlib/Makefile.am
+--- heimdal-0.6.3-old/lib/auth/afskauthlib/Makefile.am	Sun Jul 15 14:21:07 2001
++++ heimdal-0.6.3/lib/auth/afskauthlib/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -23,7 +23,7 @@
+ 	$(COMPILE) -c $<
+ 
+ if KRB4
+-KAFS = $(top_builddir)/lib/kafs/libkafs.la
++KAFS = $(LIB_kafs)
+ endif
+ 
+ if KRB5
+@@ -33,7 +33,7 @@
+ 	$(top_builddir)/lib/asn1/libasn1.la	\
+ 	$(LIB_krb4)				\
+ 	$(LIB_des)				\
+-	$(top_builddir)/lib/roken/libroken.la	\
++	$(LIB_roken)	\
+ 	-lc
+ 
+ else
+@@ -42,7 +42,7 @@
+ 	$(KAFS)	\
+ 	$(LIB_krb4)				\
+ 	$(LIB_des)				\
+-	$(top_builddir)/lib/roken/libroken.la	\
++	$(LIB_roken)	\
+ 	-lc
+ endif
+ 
+diff -ruN heimdal-0.6.3-old/lib/gssapi/Makefile.am heimdal-0.6.3/lib/gssapi/Makefile.am
+--- heimdal-0.6.3-old/lib/gssapi/Makefile.am	Tue May 13 01:20:46 2003
++++ heimdal-0.6.3/lib/gssapi/Makefile.am	Thu Aug 28 15:39:26 2003
+@@ -6,7 +6,7 @@
+ 
+ lib_LTLIBRARIES = libgssapi.la
+ libgssapi_la_LDFLAGS = -version-info 5:0:4
+-libgssapi_la_LIBADD  = ../krb5/libkrb5.la $(LIB_des) ../asn1/libasn1.la ../roken/libroken.la
++libgssapi_la_LIBADD  = ../krb5/libkrb5.la $(LIB_des) ../asn1/libasn1.la $(LIB_roken)
+ 
+ man_MANS = gssapi.3 gss_acquire_cred.3
+ 
+diff -ruN heimdal-0.6.3-old/lib/hdb/Makefile.am heimdal-0.6.3/lib/hdb/Makefile.am
+--- heimdal-0.6.3-old/lib/hdb/Makefile.am	Tue May 13 01:20:46 2003
++++ heimdal-0.6.3/lib/hdb/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -38,7 +38,7 @@
+ 
+ include_HEADERS = hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h
+ 
+-libhdb_la_LIBADD = ../krb5/libkrb5.la ../asn1/libasn1.la ../roken/libroken.la $(LIB_openldap) $(DBLIB) $(LIB_NDBM)
++libhdb_la_LIBADD = ../krb5/libkrb5.la ../asn1/libasn1.la $(LIB_roken) $(LIB_openldap) $(DBLIB) $(LIB_NDBM)
+ 
+ $(libhdb_la_OBJECTS): $(srcdir)/hdb-protos.h $(srcdir)/hdb-private.h
+ 
+diff -ruN heimdal-0.6.3-old/lib/kadm5/Makefile.am heimdal-0.6.3/lib/kadm5/Makefile.am
+--- heimdal-0.6.3-old/lib/kadm5/Makefile.am	Tue May 13 01:20:46 2003
++++ heimdal-0.6.3/lib/kadm5/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -7,8 +7,8 @@
+ libkadm5clnt_la_LDFLAGS = -version-info 6:4:2
+ sbin_PROGRAMS = dump_log replay_log truncate_log
+ 
+-libkadm5srv_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la ../roken/libroken.la
+-libkadm5clnt_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la ../roken/libroken.la
++libkadm5srv_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la $(LIB_roken)
++libkadm5clnt_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la $(LIB_roken)
+ 
+ libexec_PROGRAMS = ipropd-master ipropd-slave
+ 
+diff -ruN heimdal-0.6.3-old/lib/kafs/Makefile.am heimdal-0.6.3/lib/kafs/Makefile.am
+--- heimdal-0.6.3-old/lib/kafs/Makefile.am	Tue May 13 01:20:46 2003
++++ heimdal-0.6.3/lib/kafs/Makefile.am	Thu Aug 28 15:42:10 2003
+@@ -51,7 +51,7 @@
+ AIX_SRC =
+ endif # AIX
+ 
+-libkafs_la_LIBADD = $(DEPLIB_krb5) ../roken/libroken.la $(DEPLIB_krb4)
++libkafs_la_LIBADD = $(DEPLIB_krb5) $(LIB_roken) $(DEPLIB_krb4)
+ 
+ lib_LTLIBRARIES = libkafs.la
+ libkafs_la_LDFLAGS = -version-info 4:0:4
+diff -ruN heimdal-0.6.3-old/lib/krb5/Makefile.am heimdal-0.6.3/lib/krb5/Makefile.am
+--- heimdal-0.6.3-old/lib/krb5/Makefile.am	Tue May 13 01:20:47 2003
++++ heimdal-0.6.3/lib/krb5/Makefile.am	Thu Aug 28 15:37:16 2003
+@@ -26,7 +26,7 @@
+ 	$(LIB_roken)
+ 
+ libkrb5_la_LIBADD = \
+-	../com_err/error.lo ../com_err/com_err.lo \
++	$(LIB_com_err) \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+diff -ruN heimdal-0.6.3-old/lib/roken/acconfig.h heimdal-0.6.3/lib/roken/acconfig.h
+--- heimdal-0.6.3-old/lib/roken/acconfig.h	Sun Jul  9 00:22:08 2000
++++ heimdal-0.6.3/lib/roken/acconfig.h	Thu Aug 28 15:37:16 2003
+@@ -12,7 +12,7 @@
+ #endif
+ 
+ #define RCSID(msg) \
+-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
++static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
+ 
+ #undef PROTOTYPES
+ 
--- heimdal-0.6.3.orig/debian/patches/013_maildir
+++ heimdal-0.6.3/debian/patches/013_maildir
@@ -0,0 +1,40 @@
+Index: heimdal-0.6.3/appl/popper/pop_pass.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/popper/pop_pass.c,v
+retrieving revision 1.1.1.3
+retrieving revision 1.5
+diff -c -r1.1.1.3 -r1.5
+*** heimdal-0.6.3/appl/popper/pop_pass.c 2000/05/19 05:23:42 1.1.1.3
+--- heimdal-0.6.3/appl/popper/pop_pass.c	2000/05/19 05:33:06	1.5
+***************
+*** 197,203 ****
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+!     snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
+--- 197,218 ----
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+! 
+!     /* Try ~/Maildir */
+!     if (pw->pw_dir != NULL)
+! 	{
+!         snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Maildir");
+! 	}
+!     if(pw->pw_dir != NULL && stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try ~/Mailbox */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Mailbox");
+! 	}
+!     if(pw->pw_dir == NULL || stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try /var/spool/mail/userid */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+! 	}
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
--- heimdal-0.6.3.orig/debian/patches/014_cache
+++ heimdal-0.6.3/debian/patches/014_cache
@@ -0,0 +1,72 @@
+diff -ruN heimdal-0.6.3-old/lib/krb5/cache.c heimdal-0.6.3/lib/krb5/cache.c
+--- heimdal-0.6.3-old/lib/krb5/cache.c	Mon May 14 16:14:45 2001
++++ heimdal-0.6.3/lib/krb5/cache.c	Tue Jun 19 20:16:49 2001
+@@ -99,13 +99,28 @@
+ {
+     krb5_error_code ret;
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc(sizeof(*p));
+     if(p == NULL) {
+ 	krb5_set_error_string(context, "malloc: out of memory");
+ 	return KRB5_CC_NOMEM;
+     }
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL) {
++	krb5_set_error_string(context, "malloc: out of memory");
++        return KRB5_CC_NOMEM;
++    }
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL) {
++        free(q);
++	krb5_set_error_string(context, "strdup: out of memory");
++        return KRB5_CC_NOMEM;
++    }
++
++    p->ops = q;
+     *id = p;
+     ret = p->ops->resolve(context, id, residual);
+     if(ret)
+@@ -155,13 +170,28 @@
+ 		krb5_ccache *id)
+ {
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc (sizeof(*p));
+     if (p == NULL) {
+ 	krb5_set_error_string(context, "malloc: out of memory");
+ 	return KRB5_CC_NOMEM;
+     }
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL) {
++	krb5_set_error_string(context, "malloc: out of memory");
++        return KRB5_CC_NOMEM;
++    }
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL) {
++        free(q);
++	krb5_set_error_string(context, "strdup: out of memory");
++        return KRB5_CC_NOMEM;
++    }
++
++    p->ops = q;
+     *id = p;
+     return p->ops->gen_new(context, id);
+ }
+@@ -264,6 +294,8 @@
+ {
+     krb5_error_code ret;
+     ret = id->ops->close(context, id);
++    free(id->ops->prefix);
++    free((krb5_cc_ops *)id->ops);
+     free(id);
+     return ret;
+ }
--- heimdal-0.6.3.orig/debian/patches/015_editline
+++ heimdal-0.6.3/debian/patches/015_editline
@@ -0,0 +1,56 @@
+--- heimdal-0.6.3.old/appl/ftp/ftp/Makefile.am	Tue Aug 28 18:31:21 2001
++++ heimdal-0.6.3/appl/ftp/ftp/Makefile.am	Sat Jun 28 14:31:37 2003
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des)
++INCLUDES += -I$(srcdir)/../common -I/usr/include/editline $(INCLUDE_krb4) $(INCLUDE_des)
+ 
+ bin_PROGRAMS = ftp
+ 
+@@ -43,4 +43,4 @@
+ 	$(LIB_krb4) \
+ 	$(LIB_des) \
+ 	$(LIB_roken) \
+-	$(LIB_readline)
++	-ledit
+--- heimdal-0.6.3/kadmin/Makefile.am	2003-09-15 11:53:42.000000000 +0200
++++ heimdal-0.6.3/kadmin/Makefile.am.change	2003-09-15 12:59:00.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
++INCLUDES += -I/usr/include/editline $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
+ 
+ sbin_PROGRAMS = kadmin
+ 
+@@ -63,7 +63,7 @@
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(LIB_sl) \
+-	$(LIB_readline) \
++	-ledit \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
+
+--- heimdal-0.6.3/admin/Makefile.am	2003-09-15 11:53:42.000000000 +0200
++++ heimdal-0.6.3/admin/Makefile.am.change	2003-09-15 13:01:58.000000000 +0200
+@@ -25,5 +25,5 @@
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_sl) \
+-	$(LIB_readline) \
++	-ledit
+ 	$(LIB_roken)
+--- heimdal-0.6.3/lib/Makefile.am	2003-09-15 11:53:42.000000000 +0200
++++ heimdal-0.6.3/lib/Makefile.am.change	2003-09-15 12:44:36.000000000 +0200
+@@ -9,5 +9,5 @@
+ dir_dce = kdfs
+ endif
+ 
+-SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_sl@ asn1 @DIR_des@ krb5 \
++SUBDIRS = @DIR_roken@ vers @DIR_com_err@ @DIR_sl@ asn1 @DIR_des@ krb5 \
+ 	kafs hdb kadm5 gssapi auth $(dir_45) @DIR_otp@ $(dir_dce)
--- heimdal-0.6.3.orig/debian/patches/021_debian
+++ heimdal-0.6.3/debian/patches/021_debian
@@ -0,0 +1,50 @@
+Index: heimdal-0.6.3/appl/telnet/telnetd/telnetd.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/telnetd/telnetd.h,v
+retrieving revision 1.1.1.2
+retrieving revision 1.2
+diff -c -r1.1.1.2 -r1.2
+*** heimdal-0.6.3/appl/telnet/telnetd/telnetd.h 1999/07/24 08:24:26 1.1.1.2
+--- appl/telnet/telnetd/telnetd.h	2000/01/06 09:22:48	1.2
+***************
+*** 193,199 ****
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	BINDIR "/login"
+  
+  /* fallbacks */
+  
+--- 193,199 ----
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	"/bin/login"
+  
+  /* fallbacks */
+  
+Index: heimdal-0.6.3/lib/hdb/hdb.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/lib/hdb/hdb.h,v
+retrieving revision 1.1.1.4
+retrieving revision 1.3
+diff -c -r1.1.1.4 -r1.3
+*** heimdal-0.6.3/lib/hdb/hdb.h 2000/07/31 03:16:43 1.1.1.4
+--- heimdal-0.6.3/lib/hdb/hdb.h	2000/07/31 03:22:57	1.3
+***************
+*** 78,84 ****
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/heimdal"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
+--- 78,84 ----
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/lib/heimdal-kdc"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
--- heimdal-0.6.3.orig/debian/patches/030_autotools
+++ heimdal-0.6.3/debian/patches/030_autotools
@@ -0,0 +1,110405 @@
+diff -ruN heimdal-0.6.3-old/aclocal.m4 heimdal-0.6.3/aclocal.m4
+--- heimdal-0.6.3-old/aclocal.m4	2004-09-13 22:26:41.000000000 +1000
++++ heimdal-0.6.3/aclocal.m4	2004-09-14 08:38:23.000000000 +1000
+@@ -1,6 +1,6 @@
+-# generated automatically by aclocal 1.8.3 -*- Autoconf -*-
++# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+ # Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -11,3746 +11,3574 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
++# Add --enable-maintainer-mode option to configure.
++# From Jim Meyering
+ 
+-# serial 47 AC_PROG_LIBTOOL
++# Copyright 1996, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+ 
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-    [AC_LIBTOOL_CXX],
+-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+-  ])])
+-dnl And a similar setup for Fortran 77 support
+-  AC_PROVIDE_IFELSE([AC_PROG_F77],
+-    [AC_LIBTOOL_F77],
+-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
++# serial 2
+ 
+-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+-    [AC_LIBTOOL_GCJ],
+-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+-      [AC_LIBTOOL_GCJ],
+-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+-	[AC_LIBTOOL_GCJ],
+-      [ifdef([AC_PROG_GCJ],
+-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([A][M_PROG_GCJ],
+-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+-       ifdef([LT_AC_PROG_GCJ],
+-	     [define([LT_AC_PROG_GCJ],
+-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+-])])# AC_PROG_LIBTOOL
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
+ 
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+ 
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++# AM_CONDITIONAL                                              -*- Autoconf -*-
+ 
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Prevent multiple expansion
+-define([AC_PROG_LIBTOOL], [])
+-])# _AC_PROG_LIBTOOL
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# AC_LIBTOOL_SETUP
+-# ----------------
+-AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
++# serial 5
+ 
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+-dnl
++AC_PREREQ(2.52)
+ 
+-AC_LIBTOOL_SYS_MAX_CMD_LEN
+-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-AC_LIBTOOL_OBJDIR
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
++        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++  AC_MSG_ERROR([conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.])
++fi])])
+ 
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-_LT_AC_PROG_ECHO_BACKSLASH
++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+ 
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
+-  fi
+-  ;;
+-esac
++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Same as above, but do not quote variable references.
+-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
++AC_PREREQ([2.52])
+ 
+-# Constants:
+-rm="rm -f"
++# serial 6
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
++# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
++# Do all the work for Automake.                            -*- Autoconf -*-
+ 
+-AC_CHECK_TOOL(AR, ar, false)
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++# This macro actually does too much some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$LTCC" && LTCC=$CC
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$SED" && SED=sed
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
+-  fi
+-  ;;
+-esac
++# serial 10
+ 
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
++AC_PREREQ([2.54])
+ 
+-AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
++# the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ 
+-AC_ARG_WITH([pic],
+-    [AC_HELP_STRING([--with-pic],
+-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+-    [pic_mode="$withval"],
+-    [pic_mode=default])
+-test -z "$pic_mode" && pic_mode=default
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out.  PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition.  After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++   test -f $srcdir/config.status; then
++  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
+ 
+-# Use C for the default configuration in the libtool script
+-tagname=
+-AC_LIBTOOL_LANG_C_CONFIG
+-_LT_AC_TAGCONFIG
+-])# AC_LIBTOOL_SETUP
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++AC_SUBST([CYGPATH_W])
+ 
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ 
+-# _LT_AC_SYS_COMPILER
+-# -------------------
+-AC_DEFUN([_LT_AC_SYS_COMPILER],
+-[AC_REQUIRE([AC_PROG_CC])dnl
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+ 
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_MISSING_PROG(AMTAR, tar)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+-])# _LT_AC_SYS_COMPILER
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++                  [_AM_DEPENDENCIES(CC)],
++                  [define([AC_PROG_CC],
++                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++                  [_AM_DEPENDENCIES(CXX)],
++                  [define([AC_PROG_CXX],
++                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
+ 
+ 
+-# _LT_AC_SYS_LIBPATH_AIX
+-# ----------------------
+-# Links a minimal program and checks the executable
+-# for the system default hardcoded library path. In most cases,
+-# this is /usr/lib:/lib, but when the MPI compilers are used
+-# the location of the communication and MPI libs are included too.
+-# If we don't find anything, use the default library path according
+-# to the aix ld manual.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`
+-# Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+-}'`; fi],[])
+-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+-])# _LT_AC_SYS_LIBPATH_AIX
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  The stamp files are numbered to have different names.
+ 
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $1 | $1:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+ 
+-# _LT_AC_SHELL_INIT(ARG)
+-# ----------------------
+-AC_DEFUN([_LT_AC_SHELL_INIT],
+-[ifdef([AC_DIVERSION_NOTICE],
+-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+-	 [AC_DIVERT_PUSH(NOTICE)])
+-$1
+-AC_DIVERT_POP
+-])# _LT_AC_SHELL_INIT
++# Copyright 2002  Free Software Foundation, Inc.
+ 
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[_LT_AC_SHELL_INIT([
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-case X$ECHO in
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+-  ;;
+-esac
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 
+-echo=${ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X[$]1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+ 
+-if test "X[$]1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-[$]*
+-EOF
+-  exit 0
+-fi
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION so it can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++	 [AM_AUTOMAKE_VERSION([1.7.9])])
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++# Helper functions for option handling.                    -*- Autoconf -*-
+ 
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
+-fi
++# Copyright 2001, 2002  Free Software Foundation, Inc.
+ 
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
+-    IFS="$lt_save_ifs"
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
+-	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
+-      else
+-	# maybe with a smaller string...
+-	prev=:
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
++# serial 2
+ 
+-	if test "$prev" != 'sed 50q "[$]0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
+-      fi
+-    fi
+-  fi
+-fi
+-fi
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+ 
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
+-fi
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME.  Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+ 
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+ 
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++#
++# Check to make sure that the build environment is sane.
++#
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *ELF-32*)
+-      HPUX_IA64_MODE="32"
+-      ;;
+-    *ELF-64*)
+-      HPUX_IA64_MODE="64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-   if test "$lt_cv_prog_gnu_ld" = yes; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -melf32bsmip"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -melf32bmipn32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -melf64bmip"
+-      ;;
+-    esac
+-   else
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 3
++
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
+    fi
+-  fi
+-  rm -rf conftest*
+-  ;;
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
+ 
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*linux*|powerpc64-*linux*)
+-          LD="${LD-ld} -m elf32ppclinux"
+-          ;;
+-        s390x-*linux*)
+-          LD="${LD-ld} -m elf_s390"
+-          ;;
+-        sparc64-*linux*)
+-          LD="${LD-ld} -m elf32_sparc"
+-          ;;
+-      esac
+-      ;;
+-    *64-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_PUSH(C)
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_POP])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-  ;;
+-  ])
+-esac
++   test "$[2]" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
+ 
+-need_locks="$enable_libtool_lock"
++#  -*- Autoconf -*-
+ 
+-])# _LT_AC_LOCK
+ 
++# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+ 
+-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ----------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
+-[AC_REQUIRE([LT_AC_PROG_SED])
+-AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   lt_compiler_flag="$3"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   # The option is referenced via a variable to avoid confusing sed.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s "$ac_outfile"; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s conftest.err; then
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-])
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$5], , :, [$5])
+-else
+-    ifelse([$6], , :, [$6])
+-fi
+-])# AC_LIBTOOL_COMPILER_OPTION
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
+-# ------------------------------------------------------------
+-# Check whether the given compiler option works
+-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
+-  [$2=no
+-   save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$LDFLAGS $3"
+-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
+-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test -s conftest.err; then
+-       # Append any errors to the config.log.
+-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+-     else
+-       $2=yes
+-     fi
+-   fi
+-   $rm conftest*
+-   LDFLAGS="$save_LDFLAGS"
+-])
++# serial 3
+ 
+-if test x"[$]$2" = xyes; then
+-    ifelse([$4], , :, [$4])
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
+ else
+-    ifelse([$5], , :, [$5])
++  am_missing_run=
++  AC_MSG_WARN([`missing' script is too old or missing])
+ fi
+-])# AC_LIBTOOL_LINKER_OPTION
++])
+ 
++# AM_AUX_DIR_EXPAND
+ 
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+-  i=0
+-  testring="ABCD"
++# Copyright 2001 Free Software Foundation, Inc.
+ 
+-  case $build_os in
+-  msdosdjgpp*)
+-    # On DJGPP, this test can blow up pretty badly due to problems in libc
+-    # (any single argument exceeding 2000 bytes causes a buffer overrun
+-    # during glob expansion).  Even if it were fixed, the result of this
+-    # check would be larger than it should be.
+-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+-    ;;
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-  gnu*)
+-    # Under GNU Hurd, this test is not required because there is
+-    # no limit to the length of command line arguments.
+-    # Libtool will interpret -1 as no limit whatsoever
+-    lt_cv_sys_max_cmd_len=-1;
+-    ;;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-  cygwin* | mingw*)
+-    # On Win9x/ME, this test blows up -- it succeeds, but takes
+-    # about 5 minutes as the teststring grows exponentially.
+-    # Worse, since 9x/ME are not pre-emptively multitasking,
+-    # you end up with a "frozen" computer, even though with patience
+-    # the test eventually succeeds (with a max line length of 256k).
+-    # Instead, let's just punt: use the minimum linelength reported by
+-    # all of the supported platforms: 8192 (on NT/2K/XP).
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-  amigaos*)
+-    # On AmigaOS with pdksh, this test takes hours, literally.
+-    # So we just punt and use a minimum line length of 8192.
+-    lt_cv_sys_max_cmd_len=8192;
+-    ;;
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory.  The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run.  This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++#    fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++#    fails if $ac_aux_dir is absolute,
++#    fails when called from a subdirectory in a VPATH build with
++#          a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir.  In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
++#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++#   MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH.  The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
+ 
+- *)
+-    # If test is not a shell built-in, we'll probably end up computing a
+-    # maximum length that is only half of the actual maximum length, but
+-    # we can't tell.
+-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+-	    lt_cv_sys_max_cmd_len=$new_result &&
+-	    test $i != 17 # 1/2 MB should be enough
+-    do
+-      i=`expr $i + 1`
+-      testring=$testring$testring
+-    done
+-    testring=
+-    # Add a significant safety factor because C++ compilers can tack on massive
+-    # amounts of additional arguments before passing them to the linker.
+-    # It appears as though 1/2 is a usable value.
+-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+-    ;;
+-  esac
++# Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])
++
++AC_DEFUN([AM_AUX_DIR_EXPAND], [
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+-if test -n $lt_cv_sys_max_cmd_len ; then
+-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+-else
+-  AC_MSG_RESULT(none)
+-fi
+-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
+ 
+-# _LT_AC_CHECK_DLFCN
+-# --------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)dnl
+-])# _LT_AC_CHECK_DLFCN
++# Copyright 2001 Free Software Foundation, Inc.
+ 
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
+-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "$cross_compiling" = yes; then :
+-  [$4]
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-[#line __oline__ "configure"
+-#include "confdefs.h"
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-#include <stdio.h>
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++# AM_PROG_INSTALL_STRIP
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++# Copyright 2001 Free Software Foundation, Inc.
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-    exit (status);
+-}]
+-EOF
+-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) $1 ;;
+-      x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
+-    esac
+-  else :
+-    # compilation failed
+-    $3
+-  fi
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries.  This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++  AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-rm -fr conftest*
+-])# _LT_AC_TRY_DLOPEN_SELF
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
++#                                                          -*- Autoconf -*-
++# Copyright (C) 2003  Free Software Foundation, Inc.
+ 
+-# AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 1
++
++# Check whether the underlying file-system supports filenames
++# with a leading dot.  For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
+ else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
++  am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ;;
++# serial 5						-*- Autoconf -*-
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
+-   ;;
++# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, Inc.
+ 
+-  cygwin*)
+-    lt_cv_dlopen="dlopen"
+-    lt_cv_dlopen_libs=
+-   ;;
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-  darwin*)
+-  # if libdl is installed we need to link against it
+-    AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+-    lt_cv_dlopen="dyld"
+-    lt_cv_dlopen_libs=
+-    lt_cv_dlopen_self=yes
+-    ])
+-   ;;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-  *)
+-    AC_CHECK_FUNC([shl_load],
+-	  [lt_cv_dlopen="shl_load"],
+-      [AC_CHECK_LIB([dld], [shl_load],
+-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+-	[AC_CHECK_FUNC([dlopen],
+-	      [lt_cv_dlopen="dlopen"],
+-	  [AC_CHECK_LIB([dl], [dlopen],
+-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+-	    [AC_CHECK_LIB([svld], [dlopen],
+-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+-	      [AC_CHECK_LIB([dld], [dld_link],
+-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+-	      ])
+-	    ])
+-	  ])
+-	])
+-      ])
+-    ;;
+-  esac
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery.  Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-    AC_CACHE_CHECK([whether a program can dlopen itself],
+-	  lt_cv_dlopen_self, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+-    ])
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
++
++ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
++       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
++       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++               [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_$1_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      : > sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+-    	  lt_cv_dlopen_self_static, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+-      ])
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored.
++      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
++        am_cv_$1_dependencies_compiler_type=$depmode
++        break
++      fi
+     fi
++  done
+ 
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
++
++
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking Speeds up one-time builds
++  --enable-dependency-tracking  Do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
+ fi
+-])# AC_LIBTOOL_DLOPEN_SELF
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])
++])
+ 
++# Generate code to set up dependency tracking.   -*- Autoconf -*-
+ 
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ 
+-   lt_compiler_flag="-o out/conftest2.$ac_objext"
+-   # Insert the option either (1) after the last *FLAGS variable, or
+-   # (2) before a word containing "conftest.", or (3) at the end.
+-   # Note that $ac_compile itself does not contain backslashes and begins
+-   # with a dollar sign (not a hyphen), so the echo should work correctly.
+-   lt_compile=`echo "$ac_compile" | $SED \
+-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+-   -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+-   then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
+-     if test ! -s out/conftest.err; then
+-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-     fi
+-   fi
+-   chmod u+w .
+-   $rm conftest*
+-   # SGI C++ compiler will create directory out/ii_files/ for
+-   # template instantiation
+-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+-   $rm out/* && rmdir out
+-   cd ..
+-   rmdir conftest
+-   $rm conftest*
+-])
+-])# AC_LIBTOOL_PROG_CC_C_O
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
+-# -----------------------------------------
+-# Check to see if we can do hard links to lock some files if needed
+-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+-[AC_REQUIRE([_LT_AC_LOCK])dnl
++#serial 2
+ 
+-hard_links="nottested"
+-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  AC_MSG_CHECKING([if we can lock with hard links])
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  AC_MSG_RESULT([$hard_links])
+-  if test "$hard_links" = no; then
+-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+-    need_locks=warn
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # some people rename them; so instead we look at the file content.
++  # Grep'ing the first line is not enough: some people post-process
++  # each Makefile.in and add a new line on top of each file to say so.
++  # So let's grep whole file.
++  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++    dirpart=`AS_DIRNAME("$mf")`
++  else
++    continue
+   fi
+-else
+-  need_locks=no
+-fi
+-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
++  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
++  # Extract the definition of DEP_FILES from the Makefile without
++  # running `make'.
++  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n -e '/^U = / s///p' < "$mf"`
++  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
++  # We invoke sed twice because it is the simplest approach to
++  # changing $(DEPDIR) to its actual value in the expansion.
++  for file in `sed -n -e '
++    /^DEP_FILES = .*\\\\$/ {
++      s/^DEP_FILES = //
++      :loop
++	s/\\\\$//
++	p
++	n
++	/\\\\$/ b loop
++      p
++    }
++    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`AS_DIRNAME(["$file"])`
++    AS_MKDIR_P([$dirpart/$fdir])
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+ 
+-# AC_LIBTOOL_OBJDIR
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
++
++# Check to see how 'make' treats includes.	-*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 2
++
++# AM_MAKE_INCLUDE()
+ # -----------------
+-AC_DEFUN([AC_LIBTOOL_OBJDIR],
+-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+-[rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  lt_cv_objdir=.libs
+-else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  lt_cv_objdir=_libs
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
+ fi
+-rmdir .libs 2>/dev/null])
+-objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
+ 
+ 
+-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+-# ----------------------------------------------
+-# Check hardcoding attributes.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
+-[AC_MSG_CHECKING([how to hardcode library paths into programs])
+-_LT_AC_TAGVAR(hardcode_action, $1)=
+-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+-fi
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# AC_LIBTOOL_SYS_LIB_STRIP
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
+-[striplib=
+-old_striplib=
+-AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  AC_MSG_RESULT([yes])
+-else
+-# FIXME - insert some real tests, host_os isn't really good enough
+-  case $host_os in
+-   darwin*)
+-       if test -n "$STRIP" ; then
+-         striplib="$STRIP -x"
+-         AC_MSG_RESULT([yes])
+-       else
+-  AC_MSG_RESULT([no])
+-fi
+-       ;;
+-   *)
+-  AC_MSG_RESULT([no])
+-    ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_SYS_LIB_STRIP
++# serial 3
+ 
++AC_PREREQ(2.50)
+ 
+-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+-# -----------------------------
+-# PORTME Fill in your ld.so characteristics
+-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-shrext=".so"
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+-    # if the path contains ";" then we assume it to be the separator
+-    # otherwise default to the standard path separator (i.e. ":") - it is
+-    # assumed that no part of a normal pathname contains ";" but that should
+-    # okay in the real world where ";" in dirpaths is itself problematic.
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++# AM_PROG_LEX
++# -----------
++# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
++# "missing" invocation, for better error output.
++AC_DEFUN([AM_PROG_LEX],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
++AC_REQUIRE([AC_PROG_LEX])dnl
++if test "$LEX" = :; then
++  LEX=${am_missing_run}flex
++fi])
++
++dnl $Id: krb-prog-ln-s.m4,v 1.1.42.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl
++dnl Better test for ln -s, ln or cp
++dnl
++
++AC_DEFUN([AC_KRB_PROG_LN_S],
++[AC_MSG_CHECKING(for ln -s or something else)
++AC_CACHE_VAL(ac_cv_prog_LN_S,
++[rm -f conftestdata
++if ln -s X conftestdata 2>/dev/null
++then
++  rm -f conftestdata
++  ac_cv_prog_LN_S="ln -s"
++else
++  touch conftestdata1
++  if ln conftestdata1 conftestdata2; then
++    rm -f conftestdata*
++    ac_cv_prog_LN_S=ln
+   else
+-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    ac_cv_prog_LN_S=cp
+   fi
+-else
+-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
++fi])dnl
++LN_S="$ac_cv_prog_LN_S"
++AC_MSG_RESULT($ac_cv_prog_LN_S)
++AC_SUBST(LN_S)dnl
++])
+ 
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
++dnl $Id: mips-abi.m4,v 1.6.8.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl
++dnl Check for MIPS/IRIX ABI flags. Sets $abi and $abilibdirext to some
++dnl value.
+ 
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
++AC_DEFUN([AC_MIPS_ABI], [
++AC_ARG_WITH(mips_abi,
++	AC_HELP_STRING([--with-mips-abi=abi],[ABI to use for IRIX (32, n32, or 64)]))
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[[01]] | aix4.[[01]].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
+-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	:
+-      else
+-	can_build_shared=no
+-      fi
+-      ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-    fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
++case "$host_os" in
++irix*)
++with_mips_abi="${with_mips_abi:-yes}"
++if test -n "$GCC"; then
+ 
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+-  ;;
++# GCC < 2.8 only supports the O32 ABI. GCC >= 2.8 has a flag to select
++# which ABI to use, but only supports (as of 2.8.1) the N32 and 64 ABIs.
++#
++# Default to N32, but if GCC doesn't grok -mabi=n32, we assume an old
++# GCC and revert back to O32. The same goes if O32 is asked for - old
++# GCCs doesn't like the -mabi option, and new GCCs can't output O32.
++#
++# Don't you just love *all* the different SGI ABIs?
+ 
+-beos*)
+-  library_names_spec='${libname}${shared_ext}'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
++case "${with_mips_abi}" in 
++        32|o32) abi='-mabi=32';  abilibdirext=''     ;;
++       n32|yes) abi='-mabi=n32'; abilibdirext='32'  ;;
++        64) abi='-mabi=64';  abilibdirext='64'   ;;
++	no) abi=''; abilibdirext='';;
++         *) AC_MSG_ERROR("Invalid ABI specified") ;;
++esac
++if test -n "$abi" ; then
++ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
++dnl
++dnl can't use AC_CACHE_CHECK here, since it doesn't quote CACHE-ID to
++dnl AC_MSG_RESULT
++dnl
++AC_MSG_CHECKING([if $CC supports the $abi option])
++AC_CACHE_VAL($ac_foo, [
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS $abi"
++AC_TRY_COMPILE(,int x;, eval $ac_foo=yes, eval $ac_foo=no)
++CFLAGS="$save_CFLAGS"
++])
++ac_res=`eval echo \\\$$ac_foo`
++AC_MSG_RESULT($ac_res)
++if test $ac_res = no; then
++# Try to figure out why that failed...
++case $abi in
++	-mabi=32) 
++	save_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -mabi=n32"
++	AC_TRY_COMPILE(,int x;, ac_res=yes, ac_res=no)
++	CLAGS="$save_CFLAGS"
++	if test $ac_res = yes; then
++		# New GCC
++		AC_MSG_ERROR([$CC does not support the $with_mips_abi ABI])
++	fi
++	# Old GCC
++	abi=''
++	abilibdirext=''
++	;;
++	-mabi=n32|-mabi=64)
++		if test $with_mips_abi = yes; then
++			# Old GCC, default to O32
++			abi=''
++			abilibdirext=''
++		else
++			# Some broken GCC
++			AC_MSG_ERROR([$CC does not support the $with_mips_abi ABI])
++		fi
++	;;
++esac
++fi #if test $ac_res = no; then
++fi #if test -n "$abi" ; then
++else
++case "${with_mips_abi}" in
++        32|o32) abi='-32'; abilibdirext=''     ;;
++       n32|yes) abi='-n32'; abilibdirext='32'  ;;
++        64) abi='-64'; abilibdirext='64'   ;;
++	no) abi=''; abilibdirext='';;
++         *) AC_MSG_ERROR("Invalid ABI specified") ;;
++esac
++fi #if test -n "$GCC"; then
++;;
++esac
++])
+ 
+-bsdi4*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
++dnl
++dnl $Id: c-attribute.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
++dnl
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  shrext=".dll"
+-  need_version=no
+-  need_lib_prefix=no
++dnl
++dnl Test for __attribute__
++dnl
+ 
+-  case $GCC,$host_os in
+-  yes,cygwin* | yes,mingw* | yes,pw32*)
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
+-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    shlibpath_overrides_runpath=yes
++AC_DEFUN([AC_C___ATTRIBUTE__], [
++AC_MSG_CHECKING(for __attribute__)
++AC_CACHE_VAL(ac_cv___attribute__, [
++AC_TRY_COMPILE([
++#include <stdlib.h>
++],
++[
++static void foo(void) __attribute__ ((noreturn));
+ 
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-      ;;
+-    mingw*)
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+-      else
+-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+-      fi
+-      ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      ;;
+-    esac
+-    ;;
++static void
++foo(void)
++{
++  exit(1);
++}
++],
++ac_cv___attribute__=yes,
++ac_cv___attribute__=no)])
++if test "$ac_cv___attribute__" = "yes"; then
++  AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
++fi
++AC_MSG_RESULT($ac_cv___attribute__)
++])
+ 
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+-  soname_spec='${libname}${release}${major}$shared_ext'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+-  if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+-  else
+-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+-  fi
+-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++# serial 47 AC_PROG_LIBTOOL
++# Debian $Rev: 214 $
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+ 
+-kfreebsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++         [],
++         [m4_define([AC_PROVIDE_IFELSE],
++	         [m4_ifdef([AC_PROVIDE_$1],
++		           [$2], [$3])])])
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
+-      ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  *) # from 3.2 on
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+ 
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
++# AC_PROG_LIBTOOL
++# ---------------
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++  AC_PROVIDE_IFELSE([AC_PROG_CXX],
++    [AC_LIBTOOL_CXX],
++    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++  ])])
++dnl And a similar setup for Fortran 77 support
++  AC_PROVIDE_IFELSE([AC_PROG_F77],
++    [AC_LIBTOOL_F77],
++    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case "$host_cpu" in
+-  ia64*)
+-    shrext='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
+-   hppa*64*)
+-     shrext='.sl'
+-     hardcode_into_libs=yes
+-     dynamic_linker="$host_os dld.sl"
+-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-     soname_spec='${libname}${release}${shared_ext}$major'
+-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-     ;;
+-   *)
+-    shrext='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++    [AC_LIBTOOL_GCJ],
++    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++      [AC_LIBTOOL_GCJ],
++      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++	[AC_LIBTOOL_GCJ],
++      [ifdef([AC_PROG_GCJ],
++	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([A][M_PROG_GCJ],
++	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([LT_AC_PROG_GCJ],
++	     [define([LT_AC_PROG_GCJ],
++		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
+-    ;;
+-  *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
+-    ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-  hardcode_into_libs=yes
+-  ;;
+ 
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ 
+-# This must be Linux ELF.
+-linux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+-  # Append ld.so.conf contents to the search path
+-  if test -f /etc/ld.so.conf; then
+-    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+-  fi
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
+ 
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
+-  ;;
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
+ 
+-knetbsd*-gnu)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
+-  ;;
+ 
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
++# AC_LIBTOOL_SETUP
++# ----------------
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
+ 
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
+ 
+-nto-qnx*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
+ 
+-openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=yes
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case $host_os in
+-      openbsd2.[[89]] | openbsd2.[[89]].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
+ 
+-os2*)
+-  libname_spec='$name'
+-  shrext=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
+   ;;
++esac
+ 
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+ 
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+-      runpath_var=LD_RUN_PATH
+-      ;;
+-    siemens)
+-      need_lib_prefix=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
+-  esac
+-  ;;
++# Constants:
++rm="rm -f"
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+-    soname_spec='$libname${shared_ext}.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-*)
+-  dynamic_linker=no
+-  ;;
+-esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
+-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
+ 
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-# _LT_AC_TAGCONFIG
+-# ----------------
+-AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
+-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+-        [include additional configurations @<:@automatic@:>@])],
+-    [tagnames="$withval"])
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
+ 
+-if test -f "$ltmain" && test -n "$tagnames"; then
+-  if test ! -f "${ofile}"; then
+-    AC_MSG_WARN([output file `$ofile' does not exist])
+-  fi
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
+-  if test -z "$LTCC"; then
+-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+-    if test -z "$LTCC"; then
+-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+-    else
+-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+-    fi
+-  fi
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
+ 
+-  # Extract list of available tagged configurations in $ofile.
+-  # Note that this assumes the entire list is on one line.
+-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
+ 
+-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-  for tagname in $tagnames; do
+-    IFS="$lt_save_ifs"
+-    # Check whether tagname contains only valid characters
+-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
+-    "") ;;
+-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+-	;;
+-    esac
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
+ 
+-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+-    then
+-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+-    fi
++AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
++AC_ARG_WITH([pic],
++    [AC_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
+ 
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
+ 
+-      F77)
+-	if test -n "$F77" && test "X$F77" != "Xno"; then
+-	  AC_LIBTOOL_LANG_F77_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+ 
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-      *)
+-	AC_MSG_ERROR([Unsupported tag name: $tagname])
+-	;;
+-      esac
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
+ 
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+ 
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
+-  else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-  fi
+-fi
+-])# _LT_AC_TAGCONFIG
++# _LT_AC_SYS_LIBPATH_AIX
++# ----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
++[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_AC_SYS_LIBPATH_AIX
+ 
+ 
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
+ 
+ 
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 dll's
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
+ 
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
+ 
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
+ 
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++[$]*
++EOF
++  exit 0
++fi
+ 
+-# AC_DISABLE_SHARED
+-# -----------------
+-#- set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
+ 
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
+ 
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
+ 
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
+ 
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
+ 
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_fast_install=yes ;;
+-    no) enable_fast_install=no ;;
+-    *)
+-      enable_fast_install=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_fast_install=yes
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
+ 	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
++      fi
++    fi
++  fi
++fi
++fi
+ 
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
+ 
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
++AC_SUBST(ECHO)
++])])# _LT_AC_PROG_ECHO_BACKSLASH
+ 
+ 
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
+-
++# _LT_AC_LOCK
++# -----------
++AC_DEFUN([_LT_AC_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
+ 
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
+ 
+-# AC_PATH_TOOL_PREFIX
+-# -------------------
+-# find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-[[\\/*] |  ?:[\\/]*])
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
+   ;;
+-*)
+-  lt_save_MAGIC_CMD="$MAGIC_CMD"
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    $EGREP "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++  ;;
++  ])
++esac
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
++need_locks="$enable_libtool_lock"
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  MAGIC_CMD="$lt_save_MAGIC_CMD"
+-  ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  AC_MSG_RESULT($MAGIC_CMD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-])# AC_PATH_TOOL_PREFIX
++])# _LT_AC_LOCK
+ 
+ 
+-# AC_PATH_MAGIC
+-# -------------
+-# find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+-  else
+-    MAGIC_CMD=:
+-  fi
++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$5], , :, [$5])
++else
++    ifelse([$6], , :, [$6])
+ fi
+-])# AC_PATH_MAGIC
++])# AC_LIBTOOL_COMPILER_OPTION
+ 
+ 
+-# AC_PROG_LD
+-# ----------
+-# find the pathname to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH([gnu-ld],
+-    [AC_HELP_STRING([--with-gnu-ld],
+-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+-    [test "$withval" = no || with_gnu_ld=yes],
+-    [with_gnu_ld=no])
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by $CC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [[\\/]]* | ?:[[\\/]]*)
+-      re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
+-fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+-      *GNU* | *'with BFD'*)
+-	test "$with_gnu_ld" != no && break
+-	;;
+-      *)
+-	test "$with_gnu_ld" != yes && break
+-	;;
+-      esac
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                          [ACTION-SUCCESS], [ACTION-FAILURE])
++# ------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++[AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++     else
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$4], , :, [$4])
+ else
+-  AC_MSG_RESULT(no)
++    ifelse([$5], , :, [$5])
+ fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])# AC_PROG_LD
++])# AC_LIBTOOL_LINKER_OPTION
+ 
+ 
+-# AC_PROG_LD_GNU
+-# --------------
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_REQUIRE([AC_PROG_EGREP])dnl
+-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+-  lt_cv_prog_gnu_ld=yes
+-  ;;
+-*)
+-  lt_cv_prog_gnu_ld=no
+-  ;;
+-esac])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])# AC_PROG_LD_GNU
++# AC_LIBTOOL_SYS_MAX_CMD_LEN
++# --------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
++[# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
+ 
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
+ 
+-# AC_PROG_LD_RELOAD_FLAG
+-# ----------------------
+-# find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files],
+-  lt_cv_ld_reload_flag,
+-  [lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-])# AC_PROG_LD_RELOAD_FLAG
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
+ 
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
+ 
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
+-# how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
++# _LT_AC_CHECK_DLFCN
++# --------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)dnl
++])# _LT_AC_CHECK_DLFCN
+ 
+-cygwin*)
+-  # win32_libid is a shell function defined in ltmain.sh
+-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
+-  ;;
+ 
+-mingw* | pw32*)
+-  # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ------------------------------------------------------------------
++AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
+-freebsd* | kfreebsd*-gnu)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}]
++EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_unknown|x*) $3 ;;
+     esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
++  else :
++    # compilation failed
++    $3
+   fi
+-  ;;
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
+ 
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-hpux10.20* | hpux11*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  case "$host_cpu" in
+-  ia64*)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+-    ;;
+-  hppa*64*)
+-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+-    ;;
+-  *)
+-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++# AC_LIBTOOL_DLOPEN_SELF
++# -------------------
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
+     ;;
+-  esac
+-  ;;
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $LD in
+-  *-32|*"-32 ") libmagic=32-bit;;
+-  *-n32|*"-n32 ") libmagic=N32;;
+-  *-64|*"-64 ") libmagic=64-bit;;
+-  *) libmagic=never-match;;
+-  esac
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++   ;;
+ 
+-# This must be Linux ELF.
+-linux*)
+-  case $host_cpu in
+-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
+-    lt_cv_deplibs_check_method=pass_all ;;
+   *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++    enable_dlopen=no
+   fi
+-  ;;
+-
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+-  ;;
+ 
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
+-  ;;
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+-  else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+-  fi
+-  ;;
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+-    ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
+-    ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
+     ;;
+   esac
+-  ;;
+-
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+-])# AC_DEPLIBS_CHECK_METHOD
+ 
+-
+-# AC_PROG_NM
+-# ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
+-else
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-      */dev/null* | *'Invalid file or object type'*)
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-        ;;
+-      *)
+-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null*)
+-	  lt_cv_path_NM="$tmp_nm -p"
+-	  break
+-	  ;;
+-	*)
+-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	  continue # so that we can try to find one that supports BSD flags
+-	  ;;
+-	esac
+-      esac
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
+-
+-
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+-  # These system don't have libm, or don't need it
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, cos, LIBM="-lm")
+-  ;;
+-esac
+-])# AC_CHECK_LIBM
+-
+-
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
+   esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+ 
+-
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!).  If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, lt_dlinit,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
+ 
+ 
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
++# ---------------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler
++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++])
++])# AC_LIBTOOL_PROG_CC_C_O
+ 
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
+ 
++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
++# -----------------------------------------
++# Check to see if we can do hard links to lock some files if needed
++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
++[AC_REQUIRE([_LT_AC_LOCK])dnl
+ 
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+ 
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
++# AC_LIBTOOL_OBJDIR
++# -----------------
++AC_DEFUN([AC_LIBTOOL_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])# AC_LIBTOOL_OBJDIR
+ 
+ 
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+-
+-
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
++# ----------------------------------------------
++# Check hardcoding attributes.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
++   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+ 
++  # We can hardcode non-existant directories.
++  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_AC_TAGVAR(hardcode_action, $1)=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+-# AC_LIBTOOL_RC
+-# --------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+ 
+ 
+-# AC_LIBTOOL_LANG_C_CONFIG
++# AC_LIBTOOL_SYS_LIB_STRIP
+ # ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
+-
+-# Source file extension for C test sources.
+-ac_ext=c
+-
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+-
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
+-
+-_LT_AC_SYS_COMPILER
+-
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
++[striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+-  sco3.2v5*)
+-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         AC_MSG_RESULT([yes])
++       else
++  AC_MSG_RESULT([no])
++fi
++       ;;
++   *)
++  AC_MSG_RESULT([no])
+     ;;
+   esac
+ fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
++])# AC_LIBTOOL_SYS_LIB_STRIP
++
++
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++[AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+   else
+-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+   fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
+ 
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+-  [],
+-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
+-
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+-
+-# Report which librarie types wil actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+-
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+-
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-aix4*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+-  darwin* | rhapsody*)
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
+       else
+-        case ${MACOSX_DEPLOYMENT_TARGET} in
+-          10.[[012]])
+-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-            ;;
+-          10.*)
+-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+-            ;;
+-        esac
++	can_build_shared=no
+       fi
+       ;;
+     esac
+-    output_verbose_link_cmd='echo'
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
+   fi
+-    ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+-
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
+-
+-
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++  ;;
+ 
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
+ 
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
+-# Source file extension for C++ test sources.
+-ac_ext=cc
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
+ 
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC=$CC
+-lt_save_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+-  unset lt_cv_prog_gnu_ld
+-fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
+-  unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
+ 
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+-else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+-fi
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
++freebsd1*)
++  dynamic_linker=no
++  ;;
+ 
+-  AC_PROG_LD
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
+ 
+-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+-  # archiving commands below assume that GNU ld is being used.
+-  if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
+ 
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
+ 
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
+-
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+     else
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+     fi
+-  else
+-    with_gnu_ld=no
+-    wlarc=
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
+ 
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # linker, instead of GNU ld.  If possible, this setting should
+-    # overridden to take advantage of the native linker features on
+-    # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-  fi
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
+-  # Commands to make compiler produce verbose output that lists
+-  # what "hidden" libraries, object files and flags are used when
+-  # linking a shared library.
+-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
+ 
+-else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
+-fi
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
+ 
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	    ;;
+-	  esac
+-	done
+-      esac
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
+ 
+-    _LT_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-    if test "$GXX" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
+-      # We only want to do this on AIX 4.2 and lower, the check
+-      # below for broken collect2 doesn't work under 4.3+
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	else
+-	  # We have old collect2
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-      esac
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
+-      fi
+-    fi
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-    # It seems that -bexpall does not export symbols beginning with
+-    # underscore (_), so it is better to generate a list of symbols to export.
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-      # Determine the default libpath from the value encoded in an empty executable.
+-      _LT_AC_SYS_LIBPATH_AIX
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-     else
+-      if test "$host_cpu" = ia64; then
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	# Determine the default libpath from the value encoded in an empty executable.
+-	_LT_AC_SYS_LIBPATH_AIX
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	# -bexpall does not export symbols beginning with underscore (_)
+-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-	# Exported symbols can be pulled into shared objects from archives
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	# This is similar to how AIX traditionally builds it's shared libraries.
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+-      fi
+-    fi
+-    ;;
+-  chorus*)
+-    case $cc_basename in
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=yes
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
+       *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	shlibpath_overrides_runpath=yes
+ 	;;
+-    esac
+-    ;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-    # as there is no search path for DLLs.
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-      # If the export-symbols file already is a .def file (1st line
+-      # is EXPORTS), use it as is; otherwise, prepend...
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname.def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname.def;
+-	cat $export_symbols >> $output_objdir/$soname.def;
+-      fi~
+-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+-  darwin* | rhapsody*)
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
+       ;;
+-    *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-      else
+-        case ${MACOSX_DEPLOYMENT_TARGET} in
+-          10.[[012]])
+-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-            ;;
+-          10.*)
+-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+-            ;;
+-        esac
+-      fi
++    siemens)
++      need_lib_prefix=no
+       ;;
+-    esac
+-    lt_int_apple_cc_single_mod=no
+-    output_verbose_link_cmd='echo'
+-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-      lt_int_apple_cc_single_mod=yes
+-    fi
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    else
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    fi
+-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++
++
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
++[AC_ARG_WITH([tags],
++    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++        [include additional configurations @<:@automatic@:>@])],
++    [tagnames="$withval"])
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    AC_MSG_WARN([output file `$ofile' does not exist])
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+     else
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  else
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+   fi
+-    ;;
+ 
+-  dgux*)
+-    case $cc_basename in
+-      ec++)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      ghcx)
+-	# Green Hills C++ Compiler
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++    "") ;;
++    *)  AC_MSG_ERROR([invalid tag name: $tagname])
+ 	;;
+     esac
+-    ;;
+-  freebsd[12]*)
+-    # C++ shared libraries reported to be fairly broken before switch to ELF
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  freebsd-elf*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  freebsd* | kfreebsd*-gnu)
+-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+-    # conventions
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-    ;;
+-  gnu*)
+-    ;;
+-  hpux9*)
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-				# but as the default
+-				# location of the library.
+ 
+-    case $cc_basename in
+-    CC)
+-      # FIXME: insert proper C++ library support
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    aCC)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      # Commands to make compiler produce verbose output that lists
+-      # what "hidden" libraries, object files and flags are used when
+-      # linking a shared library.
+-      #
+-      # There doesn't appear to be a way to prevent this compiler from
+-      # explicitly linking system object files so we need to strip them
+-      # from the output so that they don't get included in the library
+-      # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-      ;;
+-    *)
+-      if test "$GXX" = yes; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-        # FIXME: insert proper C++ library support
+-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
+-    ;;
+-  hpux10*|hpux11*)
+-    if test $with_gnu_ld = no; then
+-      case "$host_cpu" in
+-      hppa*64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-        ;;
+-      ia64*)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-        ;;
+-      *)
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-        ;;
+-      esac
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+     fi
+-    case "$host_cpu" in
+-    hppa*64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+-    ia64*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+-    *)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+-					      # but as the default
+-					      # location of the library.
+-      ;;
+-    esac
+ 
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	  AC_LIBTOOL_LANG_CXX_CONFIG
++	else
++	  tagname=""
++	fi
+ 	;;
+-      aCC)
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	  ;;
+-	esac
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  AC_LIBTOOL_LANG_F77_CONFIG
++	else
++	  tagname=""
++	fi
+ 	;;
+-      *)
+-	if test "$GXX" = yes; then
+-	  if test $with_gnu_ld = no; then
+-	    case "$host_cpu" in
+-	    ia64*|hppa*64*)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
+-	      ;;
+-	    *)
+-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	      ;;
+-	    esac
+-	  fi
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  AC_LIBTOOL_LANG_GCJ_CONFIG
+ 	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  tagname=""
+ 	fi
+ 	;;
+-    esac
+-    ;;
+-  irix5* | irix6*)
+-    case $cc_basename in
+-      CC)
+-	# SGI C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++      RC)
++	AC_LIBTOOL_LANG_RC_CONFIG
+ 	;;
++
+       *)
+-	if test "$GXX" = yes; then
+-	  if test "$with_gnu_ld" = no; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+-	  else
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+-	  fi
+-	fi
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	AC_MSG_ERROR([Unsupported tag name: $tagname])
+ 	;;
+-    esac
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-    ;;
+-  linux*)
+-    case $cc_basename in
+-      KCC)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++      esac
+ 
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    AC_MSG_ERROR([unable to update list of available tagged configurations.])
++  fi
++fi
++])# _LT_AC_TAGCONFIG
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-	;;
+-      icpc)
+-	# Intel C++
+-	with_gnu_ld=yes
+-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+-	;;
+-      cxx)
+-	# Compaq C++
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+-	runpath_var=LD_RUN_PATH
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-    esac
+-    ;;
+-  lynxos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  m88k*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  mvs*)
+-    case $cc_basename in
+-      cxx)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-    fi
+-    # Workaround some broken pre-1.5 toolchains
+-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+-    ;;
+-  osf3*)
+-    case $cc_basename in
+-      KCC)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 dll's
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
+ 
+-	;;
+-      RCC)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AC_DISABLE_SHARED
++# -----------------
++#- set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
+ 
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  osf4* | osf5*)
+-    case $cc_basename in
+-      KCC)
+-	# Kuck and Associates, Inc. (KAI) C++ Compiler
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
+ 
+-	# KCC will only create a shared library if the output file
+-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+-	# to its proper name (with version) after linking.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
+ 
+-	# Archives containing C++ object files must be created using
+-	# the KAI C++ compiler.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+-	;;
+-      RCC)
+-	# Rational C++ 2.4.1
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      cxx)
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+-	  echo "-hidden">> $lib.exp~
+-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+-	  $rm $lib.exp'
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+-	;;
+-      *)
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
+ 
+-	  # Commands to make compiler produce verbose output that lists
+-	  # what "hidden" libraries, object files and flags are used when
+-	  # linking a shared library.
+-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-	else
+-	  # FIXME: insert proper C++ library support
+-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	fi
+-	;;
+-    esac
+-    ;;
+-  psos*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  sco*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    case $cc_basename in
+-      CC)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  sunos4*)
+-    case $cc_basename in
+-      CC)
+-	# Sun C++ 4.x
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      lcc)
+-	# Lucid
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  solaris*)
+-    case $cc_basename in
+-      CC)
+-	# Sun C++ 4.2, 5.x and Centerline C++
+-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
+ 
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	case $host_os in
+-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+-	  *)
+-	    # The C++ compiler is used as linker so we must use $wl
+-	    # flag to pass the commands to the underlying system
+-	    # linker.
+-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+-	    ;;
+-	esac
+-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-	# Commands to make compiler produce verbose output that lists
+-	# what "hidden" libraries, object files and flags are used when
+-	# linking a shared library.
+-	#
+-	# There doesn't appear to be a way to prevent this compiler from
+-	# explicitly linking system object files so we need to strip them
+-	# from the output so that they don't get included in the library
+-	# dependencies.
+-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognise shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
+ 
+-	# Archives containing C++ object files must be created using
+-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
+-	# necessary to make sure instantiated templates are included
+-	# in the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+-	;;
+-      gcx)
+-	# Green Hills C++ Compiler
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
+ 
+-	# The C++ compiler must be used to create the archive.
+-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+-	;;
+-      *)
+-	# GNU C++ compiler with Solaris linker
+-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  else
+-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
+-	    # platform.
+-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-	    # Commands to make compiler produce verbose output that lists
+-	    # what "hidden" libraries, object files and flags are used when
+-	    # linking a shared library.
+-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+-	  fi
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognise a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# AC_PATH_MAGIC
+ 
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+-	fi
+-	;;
+-    esac
+-    ;;
+-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-    ;;
+-  tandem*)
+-    case $cc_basename in
+-      NCC)
+-	# NonStop-UX NCC 3.20
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-      *)
+-	# FIXME: insert proper C++ library support
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	;;
+-    esac
+-    ;;
+-  vxworks*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++
++# AC_PROG_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH([gnu-ld],
++    [AC_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
+     ;;
+   *)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
+     ;;
+-esac
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+-_LT_AC_TAGVAR(GCC, $1)="$GXX"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+-
+-AC_LIBTOOL_POSTDEP_PREDEP($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
+ 
+-AC_LIBTOOL_CONFIG($1)
+ 
+-AC_LANG_POP
+-CC=$lt_save_CC
+-LDCXX=$LD
+-LD=$lt_save_LD
+-GCC=$lt_save_GCC
+-with_gnu_ldcxx=$with_gnu_ld
+-with_gnu_ld=$lt_save_with_gnu_ld
+-lt_cv_path_LDCXX=$lt_cv_path_LD
+-lt_cv_path_LD=$lt_save_path_LD
+-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+-])# AC_LIBTOOL_LANG_CXX_CONFIG
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
+ 
+-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
+-# Figure out "hidden" library dependencies from verbose
+-# compiler output when linking a shared library.
+-# Parse the compiler output and extract the necessary
+-# objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
+-dnl we can't use the lt_simple_compile_test_code here,
+-dnl because it contains code intended for an executable,
+-dnl not a library.  It's possible we should let each
+-dnl tag define a new lt_????_link_test_code variable,
+-dnl but it's only used here...
+-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
+-int a;
+-void foo (void) { a = 0; }
+-EOF
+-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
+-class Foo
+-{
+-public:
+-  Foo (void) { a = 0; }
+-private:
+-  int a;
+-};
+-EOF
+-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
+-      subroutine foo
+-      implicit none
+-      integer*4 a
+-      a=0
+-      return
+-      end
+-EOF
+-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
+-public class foo {
+-  private int a;
+-  public void bar (void) {
+-    a = 0;
+-  }
+-};
+-EOF
+-])
+-dnl Parse the compiler output and extract the necessary
+-dnl objects, libraries and library flags.
+-if AC_TRY_EVAL(ac_compile); then
+-  # Parse the compiler output and extract the necessary
+-  # objects, libraries and library flags.
+ 
+-  # Sentinel used to keep track of whether or not we are before
+-  # the conftest object file.
+-  pre_test_object_deps_done=no
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++])# AC_PROG_LD_RELOAD_FLAG
+ 
+-  # The `*' in the case matches for architectures that use `case' in
+-  # $output_verbose_cmd can trigger glob expansion during the loop
+-  # eval without this substitution.
+-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ 
+-  for p in `eval $output_verbose_link_cmd`; do
+-    case $p in
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognise dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+ 
+-    -L* | -R* | -l*)
+-       # Some compilers place space between "-{L,R}" and the path.
+-       # Remove the space.
+-       if test $p = "-L" \
+-	  || test $p = "-R"; then
+-	 prev=$p
+-	 continue
+-       else
+-	 prev=
+-       fi
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 case $p in
+-	 -L* | -R*)
+-	   # Internal compiler library paths should come after those
+-	   # provided the user.  The postdeps already come after the
+-	   # user supplied libs so there is no need to process them.
+-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+-	   else
+-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+-	   fi
+-	   ;;
+-	 # The "-l" case would never come before the object being
+-	 # linked, so don't bother handling this case.
+-	 esac
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
+-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+-	 else
+-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
+-	 fi
+-       fi
+-       ;;
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-    *.$objext)
+-       # This assumes that the test object file only shows up
+-       # once in the compiler output.
+-       if test "$p" = "conftest.$objext"; then
+-	 pre_test_object_deps_done=yes
+-	 continue
+-       fi
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
+ 
+-       if test "$pre_test_object_deps_done" = no; then
+-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
+-	 fi
+-       else
+-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+-	 else
+-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
+-	 fi
+-       fi
+-       ;;
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
+ 
+-    *) ;; # Ignore the rest.
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
+ 
+-    esac
+-  done
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-  # Clean up.
+-  rm -f a.out a.exe
+-else
+-  echo "libtool.m4: error: problem compiling $1 test program"
+-fi
+-
+-$rm -f confest.$objext
++freebsd* | kfreebsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
+ 
+-case " $_LT_AC_TAGVAR(postdeps, $1) " in
+-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+-esac
+-])# AC_LIBTOOL_POSTDEP_PREDEP
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-# AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
+-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
+-[AC_REQUIRE([AC_PROG_F77])
+-AC_LANG_PUSH(Fortran 77)
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
+ 
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-# Source file extension for f77 test sources.
+-ac_ext=f
++# This must be Linux ELF.
++linux*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-# Object file extension for compiled f77 test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  fi
++  ;;
+ 
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
+ 
+-# Code to be used in simple link tests
+-lt_simple_link_test_code="      program t\n      end\n"
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${F77-"f77"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case "$host_os" in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
+   ;;
+-aix4*)
+-  test "$enable_shared" = yes && enable_static=no
++
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ esac
+-AC_MSG_RESULT([$enable_shared])
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])# AC_DEPLIBS_CHECK_METHOD
+ 
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+ 
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++# AC_PROG_NM
++# ----------
++# find the pathname to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
+ 
+-_LT_AC_TAGVAR(GCC, $1)="$G77"
+-_LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
++# AC_CHECK_LIBM
++# -------------
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  ;;
++esac
++])# AC_CHECK_LIBM
+ 
+ 
+-AC_LIBTOOL_CONFIG($1)
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
++# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
++# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
++# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
+ 
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_F77_CONFIG
++
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
++# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
++# DIRECTORY is not provided and an installed libltdl is not found, it is
++# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
++# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
++# quotes!).  If your package is not flat and you're not using automake,
++# define top_builddir and top_srcdir appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, lt_dlinit,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
+ 
+ 
+-# AC_LIBTOOL_LANG_GCJ_CONFIG
+-# --------------------------
++# AC_LIBTOOL_CXX
++# --------------
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
++
++
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
++
++
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
++
++
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
++
++
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
++
++
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
++
++
++# AC_LIBTOOL_RC
++# --------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
++
++
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
+-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+-[AC_LANG_SAVE
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
+ 
+-# Source file extension for Java test sources.
+-ac_ext=java
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-# Object file extension for compiled Java test sources.
++# Object file extension for compiled C test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='int main(){return(0);}\n'
+ 
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+-# Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${GCJ-"gcj"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
++#
++# Check for any special shared library compilation flags.
++#
++_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
++    ;;
++  esac
++fi
++if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
++  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
++  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
++  else
++    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
++    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
++  fi
++fi
++
++
++#
++# Check to make sure the static flag actually works.
++#
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ 
+-# GCJ did not exist at the time GCC didn't implicitly link libc in.
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+ AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+ AC_LIBTOOL_PROG_COMPILER_PIC($1)
+@@ -3762,776 +3590,2021 @@
+ AC_LIBTOOL_SYS_LIB_STRIP
+ AC_LIBTOOL_DLOPEN_SELF($1)
+ 
++# Report which librarie types wil actually be built
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++  darwin* | rhapsody*)
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    case "$host_os" in
++    rhapsody* | darwin1.[[012]])
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[[012]])
++            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++      ;;
++    esac
++    output_verbose_link_cmd='echo'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
++    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++  else
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++  fi
++    ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
+ AC_LIBTOOL_CONFIG($1)
+ 
+-AC_LANG_RESTORE
++AC_LANG_POP
+ CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_GCJ_CONFIG
++])# AC_LIBTOOL_LANG_C_CONFIG
+ 
+ 
+-# AC_LIBTOOL_LANG_RC_CONFIG
++# AC_LIBTOOL_LANG_CXX_CONFIG
+ # --------------------------
+-# Ensure that the configuration vars for the Windows resource compiler are
++# Ensure that the configuration vars for the C compiler are
+ # suitably defined.  Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
+-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
+-[AC_LANG_SAVE
++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
++[AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([AC_PROG_CXXCPP])
+ 
+-# Source file extension for RC test sources.
+-ac_ext=rc
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-# Object file extension for compiled RC test sources.
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+ 
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+ # Code to be used in simple link tests
+-lt_simple_link_test_code="$lt_simple_compile_test_code"
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+ 
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+ 
+ # Allow CC to be a program name with arguments.
+-lt_save_CC="$CC"
+-CC=${RC-"windres"}
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+-
+-AC_LIBTOOL_CONFIG($1)
+-
+-AC_LANG_RESTORE
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_RC_CONFIG
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++else
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++fi
+ 
+-# AC_LIBTOOL_CONFIG([TAGNAME])
+-# ----------------------------
+-# If TAGNAME is not passed, then create an initial libtool script
+-# with a default configuration from the untagged config vars.  Otherwise
+-# add code to config.status for appending the configuration named by
+-# TAGNAME from the matching tagged config vars.
+-AC_DEFUN([AC_LIBTOOL_CONFIG],
+-[# The else clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  # See if we are running on zsh, and set the options which allow our commands through
+-  # without removal of \ escapes.
+-  if test -n "${ZSH_VERSION+set}" ; then
+-    setopt NO_GLOB_SUBST
+-  fi
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+-    SED SHELL STRIP \
+-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+-    deplibs_check_method reload_flag reload_cmds need_locks \
+-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+-    lt_cv_sys_global_symbol_to_c_name_address \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
+-    _LT_AC_TAGVAR(compiler, $1) \
+-    _LT_AC_TAGVAR(CC, $1) \
+-    _LT_AC_TAGVAR(LD, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
+-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
+-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
+-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
+-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
+-    _LT_AC_TAGVAR(predep_objects, $1) \
+-    _LT_AC_TAGVAR(postdep_objects, $1) \
+-    _LT_AC_TAGVAR(predeps, $1) \
+-    _LT_AC_TAGVAR(postdeps, $1) \
+-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
+-    _LT_AC_TAGVAR(archive_cmds, $1) \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
+-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
+-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
+-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
+-    _LT_AC_TAGVAR(module_cmds, $1) \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
+-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
+-    _LT_AC_TAGVAR(include_expsyms, $1); do
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
+ 
+-    case $var in
+-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_cmds, $1) | \
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_cmds, $1) | \
+-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
++  AC_PROG_LD
+ 
+-  case $lt_echo in
+-  *'\[$]0 --fallback-echo"')
+-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
+-    ;;
+-  esac
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+-ifelse([$1], [],
+-  [cfgfile="${ofile}T"
+-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
+-  $rm -f "$cfgfile"
+-  AC_MSG_NOTICE([creating $ofile])],
+-  [cfgfile="$ofile"])
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+-  cat <<__EOF__ >> "$cfgfile"
+-ifelse([$1], [],
+-[#! $SHELL
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
+ 
+-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+-# Free Software Foundation, Inc.
+-#
+-# This file is part of GNU Libtool:
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
+ 
+-# A sed program that does not truncate output.
+-SED=$lt_SED
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
+ 
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
+ 
+-# The names of the tagged configurations supported by this script.
+-available_tags=
+-
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+-
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+-
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
+-
+-# Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
+-
+-# Whether or not to disallow shared libs when runtime libs are static
+-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+-
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+-
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+-
+-# A C compiler.
+-LTCC=$lt_LTCC
+-
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++# PORTME: fill in a description of your system's C++ link characteristics
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
+ 
+-# An ERE matcher.
+-EGREP=$lt_EGREP
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
+ 
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++    _LT_AC_TAGVAR(archive_cmds, $1)=''
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[012]|aix4.[012].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	else
++	  # We have old collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
+ 
+-# A symbol stripping program
+-STRIP=$lt_STRIP
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      _LT_AC_SYS_LIBPATH_AIX
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	_LT_AC_SYS_LIBPATH_AIX
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
++	# Exported symbols can be pulled into shared objects from archives
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++    # as there is no search path for DLLs.
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++  ;;
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
++  darwin* | rhapsody*)
++  if test "$GXX" = yes; then
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    case "$host_os" in
++    rhapsody* | darwin1.[[012]])
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[[012]])
++            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++      ;;
++    esac
++    lt_int_apple_cc_single_mod=no
++    output_verbose_link_cmd='echo'
++    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
++      lt_int_apple_cc_single_mod=yes
++    fi
++    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    else
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    fi
++    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    fi
++    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++  else
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++  fi
++    ;;
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+-
+-# Old archive suffix (normally "a").
+-libext="$libext"
+-
+-# Shared library suffix (normally ".so").
+-shrext='$shrext'
+-
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+-
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
+-
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+-
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+-
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  freebsd[12]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  freebsd-elf*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    aCC)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++        ;;
++      ia64*)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++        ;;
++      *)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++    ia64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	;;
++    esac
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++	runpath_var=LD_RUN_PATH
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Library versioning type.
+-version_type=$version_type
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ 
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+ 
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ 
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  sco*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++	# The C++ compiler must be used to create the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++AC_LIBTOOL_CONFIG($1)
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
++AC_LANG_POP
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++])# AC_LIBTOOL_LANG_CXX_CONFIG
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
++# ------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
+ 
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
+ 
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++    *) ;; # Ignore the rest.
+ 
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+-
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+-
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++    esac
++  done
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
++fi
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++$rm -f confest.$objext
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])# AC_LIBTOOL_POSTDEP_PREDEP
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++# AC_LIBTOOL_LANG_F77_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
++[AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# Source file extension for f77 test sources.
++ac_ext=f
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
+ 
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
+ 
+-__EOF__
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
+-ifelse([$1],[], [
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "$cfgfile"
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
+-EOF
+-    ;;
+-  esac
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
+ 
+-  mv -f "$cfgfile" "$ofile" || \
+-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+-  chmod +x "$ofile"
+-])
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
+-  if test -f "$ltmain_in"; then
+-    test -f Makefile && make "$ltmain"
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
+   fi
+-fi
+-])# AC_LIBTOOL_CONFIG
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
+ 
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
+ 
+-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
+-# -------------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++_LT_AC_TAGVAR(GCC, $1)="$G77"
++_LT_AC_TAGVAR(LD, $1)="$LD"
+ 
+-if test "$GCC" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
+ 
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+-    lt_cv_prog_compiler_rtti_exceptions,
+-    [-fno-rtti -fno-exceptions], [],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+-fi
+-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
+ 
++AC_LIBTOOL_CONFIG($1)
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+-[
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_F77_CONFIG
+ 
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++# AC_LIBTOOL_LANG_GCJ_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
++[AC_LANG_SAVE
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
++# Source file extension for Java test sources.
++ac_ext=java
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  if test "$host_cpu" = ia64; then
+-    symcode='[[ABCDEGRST]]'
+-  fi
+-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-osf*)
+-  symcode='[[BCDEGQRST]]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[[BDRT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+ 
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $build_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-case `$NM -V 2>&1` in
+-*GNU* | *'with BFD'*)
+-  symcode='[[ABCDGIRSTW]]' ;;
+-esac
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ 
+-  # Write the raw and C identifiers.
+-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
++AC_LIBTOOL_CONFIG($1)
+ 
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_GCJ_CONFIG
+ 
+-  if AC_TRY_EVAL(ac_compile); then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
+ 
+-      # Make sure that we snagged all the symbols we need.
+-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
++# AC_LIBTOOL_LANG_RC_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the Windows resource compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
++[AC_LANG_SAVE
+ 
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++# Source file extension for RC test sources.
++ac_ext=rc
+ 
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr_t void *
+-#else
+-# define lt_ptr_t char *
+-# define const
+-#endif
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr_t address;
+-}
+-lt_preloaded_symbols[[]] =
+-{
+-EOF
+-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr_t) 0}
+-};
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  lt_save_LIBS="$LIBS"
+-	  lt_save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$lt_save_LIBS"
+-	  CFLAGS="$lt_save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+-      fi
+-    else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+-    fi
+-  else
+-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
+ 
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
+-])
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  lt_cv_sys_global_symbol_to_cdecl=
+-fi
+-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+-  AC_MSG_RESULT(failed)
+-else
+-  AC_MSG_RESULT(ok)
+-fi
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ 
+-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
+-# ---------------------------------------
+-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
+-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++AC_LIBTOOL_CONFIG($1)
+ 
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+- ifelse([$1],[CXX],[
+-  # C++ specific cases for pic, static, wl, etc.
+-  if test "$GXX" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_RC_CONFIG
+ 
+-    case $host_os in
+-    aix*)
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      fi
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
++
++# AC_LIBTOOL_CONFIG([TAGNAME])
++# ----------------------------
++# If TAGNAME is not passed, then create an initial libtool script
++# with a default configuration from the untagged config vars.  Otherwise
++# add code to config.status for appending the configuration named by
++# TAGNAME from the matching tagged config vars.
++AC_DEFUN([AC_LIBTOOL_CONFIG],
++[# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    _LT_AC_TAGVAR(compiler, $1) \
++    _LT_AC_TAGVAR(CC, $1) \
++    _LT_AC_TAGVAR(LD, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++    _LT_AC_TAGVAR(predep_objects, $1) \
++    _LT_AC_TAGVAR(postdep_objects, $1) \
++    _LT_AC_TAGVAR(predeps, $1) \
++    _LT_AC_TAGVAR(postdeps, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(archive_cmds, $1) \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(postinstall_cmds, $1) \
++    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++    _LT_AC_TAGVAR(no_undefined_flag, $1) \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++    _LT_AC_TAGVAR(hardcode_automatic, $1) \
++    _LT_AC_TAGVAR(module_cmds, $1) \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(exclude_expsyms, $1) \
++    _LT_AC_TAGVAR(include_expsyms, $1); do
++
++    case $var in
++    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(module_cmds, $1) | \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+-    mingw* | os2* | pw32*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\[$]0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++    ;;
++  esac
++
++ifelse([$1], [],
++  [cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  AC_MSG_NOTICE([creating $ofile])],
++  [cfgfile="$ofile"])
++
++  cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++
++# Is the compiler the GNU C compiler?
++with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++
++# Symbols that must always be exported.
++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++
++ifelse([$1],[],
++[# ### END LIBTOOL CONFIG],
++[# ### END LIBTOOL TAG CONFIG: $tagname])
++
++__EOF__
++
++ifelse([$1],[], [
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++])
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++])# AC_LIBTOOL_CONFIG
++
++
++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++
++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++
++if test "$GCC" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++
++
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris* | sysv5*)
++  symcode='[[BDRT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++
++
++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
++# ---------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++ ifelse([$1],[CXX],[
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+       ;;
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+@@ -4670,7 +5743,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -4745,1905 +5818,3961 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      unixware*)
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
++    esac
++  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ 	;;
+-      vxworks*)
++      esac
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
+ 	;;
+       *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      ccc*)
++        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    ;;
++  *)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++])
++
++
++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
++# ------------------------------------
++# See if the linker supports building shared libraries.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
++[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux*)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++  ;;
++  *)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++],[
++  runpath_var=
++  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_AC_TAGVAR(archive_cmds, $1)=
++  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++  _LT_AC_TAGVAR(module_cmds, $1)=
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(always_export_symbols, $1)=no
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_AC_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
++      fi
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+     esac
+-  fi
+-],
+-[
+-  if test "$GCC" = yes; then
+-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
++      runpath_var=LD_RUN_PATH
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
+     case $host_os in
+-      aix*)
+-      # All AIX code is PIC.
++    aix3*)
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
+       if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      _LT_AC_TAGVAR(archive_cmds, $1)=''
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[012]|aix4.[012].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  else
++  	  # We have old collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 _LT_AC_SYS_LIBPATH_AIX
++	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
+       fi
+       ;;
+ 
+     amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      # see comment about different semantics on the GNU ld section
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
++    bsdi4*)
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+       ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+       ;;
+ 
+     darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+-      ;;
+-
+-    msdosdjgpp*)
+-      # Just because we use GCC doesn't mean we suddenly get shared libraries
+-      # on systems that don't support them.
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+-      enable_shared=no
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+-      fi
+-      ;;
+-
+-    hpux*)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case "$host_cpu" in
+-      hppa*64*|ia64*)
+-	# +Z the default
++    if test "$GXX" = yes ; then
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      case "$host_os" in
++      rhapsody* | darwin1.[[012]])
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+ 	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[[012]])
++            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
+ 	;;
+       esac
++    	lt_int_apple_cc_single_mod=no
++    	output_verbose_link_cmd='echo'
++    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
++    	  lt_int_apple_cc_single_mod=yes
++    	fi
++    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    	else
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      fi
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        else
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        fi
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
+       ;;
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for flag to pass linker flags through the system compiler.
+-    case $host_os in
+-    aix*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+-      else
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+-      fi
++    dgux*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++    freebsd1*)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case "$host_cpu" in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # PIC (with -KPIC) is the default.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    linux*)
+-      case $CC in
+-      icc* | ecc*)
+-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+-        ;;
+-      ccc*)
+-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-        # All Alpha code is PIC.
+-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-        ;;
+-      esac
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       ;;
+ 
+-    osf3* | osf4* | osf5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      # All OSF/1 code is PIC.
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+-      ;;
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
+       ;;
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    newsos6)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    openbsd*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	   ;;
++	 *)
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	   ;;
++       esac
+       fi
+       ;;
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++    os2*)
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+       ;;
+ 
+-    *)
+-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       ;;
+-    esac
+-  fi
+-])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+-
+-#
+-# Check to make sure the PIC flag actually works.
+-#
+-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
+-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+-     "" | " "*) ;;
+-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+-     esac],
+-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+-fi
+-case "$host_os" in
+-  # For platforms which do not support PIC, -DPIC is meaningless:
+-  *djgpp*)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+-    ;;
+-  *)
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+-    ;;
+-esac
+-])
+-
+-
+-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+-# ------------------------------------
+-# See if the linker supports building shared libraries.
+-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-ifelse([$1],[CXX],[
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  case $host_os in
+-  aix4* | aix5*)
+-    # If we're using GNU nm, then we don't want the "-C" option.
+-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    else
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-    fi
+-    ;;
+-  pw32*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+-  ;;
+-  cygwin* | mingw*)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  *)
+-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  ;;
+-  esac
+-],[
+-  runpath_var=
+-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+-  _LT_AC_TAGVAR(archive_cmds, $1)=
+-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
+-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-  _LT_AC_TAGVAR(module_cmds, $1)=
+-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
+-  _LT_AC_TAGVAR(include_expsyms, $1)=
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
+-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  extract_expsyms_cmds=
+-
+-  case $host_os in
+-  cygwin* | mingw* | pw32*)
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+ 
+-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
++	# Both c and cxx compiler support -rpath directly
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
+ 
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
++    sco3.2v5*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
+ 
+-EOF
++    solaris*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+       fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      esac
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-      # that the semantics of dynamic libraries on AmigaOS, at least up
+-      # to version 4, is to share data among multiple programs linked
+-      # with the same dynamic library.  Since this doesn't match the
+-      # behavior of shared libraries on other platforms, we can't use
+-      # them.
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    beos*)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++    sysv4.3*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+       fi
+       ;;
+ 
+-    cygwin* | mingw* | pw32*)
+-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+-      # as there is no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++    sysv4.2uw2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
+ 
+-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
+-	ld_shlibs=no
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-	wlarc=
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      fi
++    sysv5*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
+       ;;
+ 
+-    solaris* | sysv5*)
+-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-	cat <<EOF 1>&2
++    uts4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
++    *)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-EOF
+-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_AC_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+       else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++        cat conftest.err 1>&5
+       fi
++      $rm conftest*
++      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+       ;;
++    esac
++  fi
++  ;;
++esac
++])# AC_LIBTOOL_PROG_LD_SHLIBS
++
++
++# _LT_AC_FILE_LTDLL_C
++# -------------------
++# Be careful that the start marker always follows a newline.
++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++])# _LT_AC_FILE_LTDLL_C
++
++
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++
+ 
+-    sunos4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      wlarc=
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+-  linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
+-      supports_anon_versioning=no
+-      case `$LD -v 2>/dev/null` in
+-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-        *\ 2.11.*) ;; # other 2.11 versions
+-        *) supports_anon_versioning=yes ;;
+-      esac
+-      if test $supports_anon_versioning = yes; then
+-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-$echo "local: *; };" >> $output_objdir/$libname.ver~
+-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-      else
+-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
+-      fi
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-    ;;
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+-    *)
+-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      fi
+-      ;;
+-    esac
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++  AC_SUBST(GCJFLAGS)
++])
+ 
+-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+-      runpath_var=LD_RUN_PATH
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
++
++# NOTE: This macro has been submitted for inclusion into   #
++#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
++#  a released version of Autoconf we should remove this    #
++#  macro and use it instead.                               #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
+     fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      if test "$GCC" = yes && test -z "$link_static_flag"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
+-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-      fi
+-      ;;
++  done
++done
++SED=$lt_cv_path_SED
++])
++AC_MSG_RESULT([$SED])
++])
+ 
+-    aix4* | aix5*)
+-      if test "$host_cpu" = ia64; then
+-	# On IA64, the linker does run time linking by default, so we don't
+-	# have to do anything special.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	else
+-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+-	fi
+-	aix_use_runtimelinking=no
++dnl $Id: wflags.m4,v 1.3.34.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl set WFLAGS
+ 
+-	# Test if we are trying to use run time linking or normal
+-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-	# need to do runtime linking.
+-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	  for ld_flag in $LDFLAGS; do
+-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-  	    aix_use_runtimelinking=yes
+-  	    break
+-  	  fi
+-	  done
+-	esac
++AC_DEFUN([AC_WFLAGS],[
++WFLAGS_NOUNUSED=""
++WFLAGS_NOIMPLICITINT=""
++if test -z "$WFLAGS" -a "$GCC" = "yes"; then
++  # -Wno-implicit-int for broken X11 headers
++  # leave these out for now:
++  #   -Wcast-align doesn't work well on alpha osf/1
++  #   -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast
++  #   -Wmissing-declarations -Wnested-externs
++  WFLAGS="ifelse($#, 0,-Wall, $1)"
++  WFLAGS_NOUNUSED="-Wno-unused"
++  WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
++fi
++AC_SUBST(WFLAGS)dnl
++AC_SUBST(WFLAGS_NOUNUSED)dnl
++AC_SUBST(WFLAGS_NOIMPLICITINT)dnl
++])
+ 
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
++dnl $Id: test-package.m4,v 1.12.4.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl rk_TEST_PACKAGE(package,headers,libraries,extra libs,
++dnl			default locations, conditional, config-program)
+ 
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++AC_DEFUN([rk_TEST_PACKAGE],[
++AC_ARG_WITH($1,
++	AC_HELP_STRING([--with-$1=dir],[use $1 in dir]))
++AC_ARG_WITH($1-lib,
++	AC_HELP_STRING([--with-$1-lib=dir],[use $1 libraries in dir]),
++[if test "$withval" = "yes" -o "$withval" = "no"; then
++  AC_MSG_ERROR([No argument for --with-$1-lib])
++elif test "X$with_$1" = "X"; then
++  with_$1=yes
++fi])
++AC_ARG_WITH($1-include,
++	AC_HELP_STRING([--with-$1-include=dir],[use $1 headers in dir]),
++[if test "$withval" = "yes" -o "$withval" = "no"; then
++  AC_MSG_ERROR([No argument for --with-$1-include])
++elif test "X$with_$1" = "X"; then
++  with_$1=yes
++fi])
++AC_ARG_WITH($1-config,
++	AC_HELP_STRING([--with-$1-config=path],[config program for $1]))
+ 
+-      _LT_AC_TAGVAR(archive_cmds, $1)=''
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++m4_ifval([$6],
++	m4_define([rk_pkgname], $6),
++	m4_define([rk_pkgname], AS_TR_CPP($1)))
++
++AC_MSG_CHECKING(for $1)
++
++case "$with_$1" in
++yes|"") d='$5' ;;
++no)	d= ;;
++*)	d="$with_$1" ;;
++esac
+ 
+-      if test "$GCC" = yes; then
+-	case $host_os in aix4.[012]|aix4.[012].*)
+-	# We only want to do this on AIX 4.2 and lower, the check
+-	# below for broken collect2 doesn't work under 4.3+
+-	  collect2name=`${CC} -print-prog-name=collect2`
+-	  if test -f "$collect2name" && \
+-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	  then
+-  	  # We have reworked collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  else
+-  	  # We have old collect2
+-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-  	  # It fails to find uninstalled libraries when the uninstalled
+-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-  	  # to unsupported forces relinking
+-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	  fi
+-	esac
+-	shared_flag='-shared'
+-      else
+-	# not using gcc
+-	if test "$host_cpu" = ia64; then
+-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-  	# chokes on -Wl,-G. The following line is correct:
+-	  shared_flag='-G'
+-	else
+-  	if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='${wl}-G'
+-	  else
+-	    shared_flag='${wl}-bM:SRE'
+-  	fi
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_$1_include" = ""; then
++		if test -d "$i/include/$1"; then
++			header_dirs="$header_dirs $i/include/$1"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
+ 	fi
+-      fi
++	if test "$with_$1_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
+ 
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
+-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+-       # Determine the default libpath from the value encoded in an empty executable.
+-       _LT_AC_SYS_LIBPATH_AIX
+-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-       else
+-	if test "$host_cpu" = ia64; then
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-	else
+-	 # Determine the default libpath from the value encoded in an empty executable.
+-	 _LT_AC_SYS_LIBPATH_AIX
+-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
+-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+-	  # -bexpall does not export symbols beginning with underscore (_)
+-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+-	  # Exported symbols can be pulled into shared objects from archives
+-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-	  # This is similar to how AIX traditionally builds it's shared libraries.
+-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++if test "$with_$1_include"; then
++	header_dirs="$with_$1_include $header_dirs"
++fi
++if test "$with_$1_lib"; then
++	lib_dirs="$with_$1_lib $lib_dirs"
++fi
++
++if test "$with_$1_config" = ""; then
++	with_$1_config='$7'
++fi
++
++$1_cflags=
++$1_libs=
++
++case "$with_$1_config" in
++yes|no|"")
++	;;
++*)
++	$1_cflags="`$with_$1_config --cflags 2>&1`"
++	$1_libs="`$with_$1_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_$1" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$[]$1_cflags" -a "$[]$1_libs"; then
++		CFLAGS="$[]$1_cflags $save_CFLAGS"
++		LIBS="$[]$1_libs $save_LIBS"
++		AC_TRY_LINK([$2],,[
++			INCLUDE_$1="$[]$1_cflags"
++			LIB_$1="$[]$1_libs"
++			AC_MSG_RESULT([from $with_$1_config])
++			found=yes])
+ 	fi
+-      fi
+-      ;;
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			AC_TRY_COMPILE([$2],,ires=$i;break)
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i $3 $4 $save_LIBS"
++			AC_TRY_LINK([$2],,lres=$i;break)
++		done
++		if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
++			DIR_$1=
++			INCLUDE_$1="-I$ires"
++			LIB_$1="-L$lres $3 $4"
++			found=yes
++			AC_MSG_RESULT([headers $ires, libraries $lres])
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
+ 
+-    amigaos*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      # see comment about different semantics on the GNU ld section
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++if test "$found" = yes; then
++	AC_DEFINE_UNQUOTED(rk_pkgname, 1, [Define if you have the $1 package.])
++	with_$1=yes
++else
++	with_$1=no
++	DIR_$1=
++	INCLUDE_$1=
++	LIB_$1=
++	AC_MSG_RESULT(no)
++fi
+ 
+-    bsdi4*)
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+-      ;;
++AC_SUBST(DIR_$1)
++AC_SUBST(INCLUDE_$1)
++AC_SUBST(LIB_$1)
++])
+ 
+-    cygwin* | mingw* | pw32*)
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-      # The linker will automatically build a .lib file if we build a DLL.
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+-      # FIXME: Should let the user specify the lib program.
+-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+-      ;;
++dnl $Id: find-func.m4,v 1.1.42.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl AC_FIND_FUNC(func, libraries, includes, arguments)
++AC_DEFUN([AC_FIND_FUNC], [
++AC_FIND_FUNC_NO_LIBS([$1], [$2], [$3], [$4])
++if test -n "$LIB_$1"; then
++	LIBS="$LIB_$1 $LIBS"
++fi
++])
+ 
+-    darwin* | rhapsody*)
+-    if test "$GXX" = yes ; then
+-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-      case "$host_os" in
+-      rhapsody* | darwin1.[[012]])
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
++dnl $Id: find-func-no-libs.m4,v 1.5.20.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl
++dnl Look for function in any of the specified libraries
++dnl
++
++dnl AC_FIND_FUNC_NO_LIBS(func, libraries, includes, arguments, extra libs, extra args)
++AC_DEFUN([AC_FIND_FUNC_NO_LIBS], [
++AC_FIND_FUNC_NO_LIBS2([$1], ["" $2], [$3], [$4], [$5], [$6])])
++
++dnl $Id: find-func-no-libs2.m4,v 1.6.10.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl
++dnl Look for function in any of the specified libraries
++dnl
++
++dnl AC_FIND_FUNC_NO_LIBS2(func, libraries, includes, arguments, extra libs, extra args)
++AC_DEFUN([AC_FIND_FUNC_NO_LIBS2], [
++
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(ac_cv_funclib_$1,
++[
++if eval "test \"\$ac_cv_func_$1\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in $2; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS="$6 $ac_lib $5 $ac_save_LIBS"
++		AC_TRY_LINK([$3],[$1($4)],eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break)
++	done
++	eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}"
++	LIBS="$ac_save_LIBS"
++fi
++])
++
++eval "ac_res=\$ac_cv_funclib_$1"
++
++if false; then
++	AC_CHECK_FUNCS($1)
++dnl	AC_CHECK_LIBS($2, foo)
++fi
++# $1
++eval "ac_tr_func=HAVE_[]upcase($1)"
++eval "ac_tr_lib=HAVE_LIB[]upcase($ac_res | sed -e 's/-l//')"
++eval "LIB_$1=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_$1=yes"
++	eval "LIB_$1="
++	AC_DEFINE_UNQUOTED($ac_tr_func)
++	AC_MSG_RESULT([yes])
++	;;
++	no)
++	eval "ac_cv_func_$1=no"
++	eval "LIB_$1="
++	AC_MSG_RESULT([no])
+ 	;;
+-      *) # Darwin 1.3 on
+-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-      else
+-        case ${MACOSX_DEPLOYMENT_TARGET} in
+-          10.[[012]])
+-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+-            ;;
+-          10.*)
+-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+-            ;;
+-        esac
+-      fi
++	*)
++	eval "ac_cv_func_$1=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	AC_DEFINE_UNQUOTED($ac_tr_func)
++	AC_DEFINE_UNQUOTED($ac_tr_lib)
++	AC_MSG_RESULT([yes, in $ac_res])
+ 	;;
+-      esac
+-    	lt_int_apple_cc_single_mod=no
+-    	output_verbose_link_cmd='echo'
+-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+-    	  lt_int_apple_cc_single_mod=yes
+-    	fi
+-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-    	else
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      fi
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        else
+-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-        fi
+-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-    else
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    fi
+-      ;;
++esac
++AC_SUBST(LIB_$1)
++])
+ 
+-    dgux*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
+ 
+-    freebsd1*)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
++dnl $Id: misc.m4,v 1.5 2002/05/24 15:35:32 joda Exp $
++dnl
++AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl
++AC_DEFUN([rk_LIBOBJ],[AC_LIBOBJ([$1])])dnl
++AC_DEFUN([rk_CONFIG_HEADER],[AH_TOP([#ifndef RCSID
++#define RCSID(msg) \
++static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
++#endif
+ 
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++/* Maximum values on all known systems */
++#define MaxHostNameLen (64+4)
++#define MaxPathLen (1024+4)
+ 
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++])])
++dnl $Id: crypto.m4,v 1.16.2.1 2003/05/05 20:08:32 joda Exp $
++dnl
++dnl test for crypto libraries:
++dnl - libcrypto (from openssl)
++dnl - libdes (from krb4)
++dnl - own-built libdes
++
++m4_define([test_headers], [
++		#undef KRB5 /* makes md4.h et al unhappy */
++		#ifdef HAVE_OPENSSL
++		#include <openssl/md4.h>
++		#include <openssl/md5.h>
++		#include <openssl/sha.h>
++		#define OPENSSL_DES_LIBDES_COMPATIBILITY
++		#include <openssl/des.h>
++		#include <openssl/rc4.h>
++		#include <openssl/rand.h>
++		#else
++		#include <md4.h>
++		#include <md5.h>
++		#include <sha.h>
++		#include <des.h>
++		#include <rc4.h>
++		#endif
++		#ifdef OLD_HASH_NAMES
++		typedef struct md4 MD4_CTX;
++		#define MD4_Init(C) md4_init((C))
++		#define MD4_Update(C, D, L) md4_update((C), (D), (L))
++		#define MD4_Final(D, C) md4_finito((C), (D))
++		typedef struct md5 MD5_CTX;
++		#define MD5_Init(C) md5_init((C))
++		#define MD5_Update(C, D, L) md5_update((C), (D), (L))
++		#define MD5_Final(D, C) md5_finito((C), (D))
++		typedef struct sha SHA_CTX;
++		#define SHA1_Init(C) sha_init((C))
++		#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
++		#define SHA1_Final(D, C) sha_finito((C), (D))
++		#endif
++		])
++m4_define([test_body], [
++		void *schedule = 0;
++		MD4_CTX md4;
++		MD5_CTX md5;
++		SHA_CTX sha1;
++
++		MD4_Init(&md4);
++		MD5_Init(&md5);
++		SHA1_Init(&sha1);
++		#ifdef HAVE_OPENSSL
++		RAND_status();
++		#endif
++
++		des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
++		RC4(0, 0, 0, 0);])
++
++
++AC_DEFUN([KRB_CRYPTO],[
++crypto_lib=unknown
++AC_WITH_ALL([openssl])
++
++DIR_des=
++
++AC_MSG_CHECKING([for crypto library])
++
++openssl=no
++old_hash=no
++
++if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
++	save_CPPFLAGS="$CPPFLAGS"
++	save_LIBS="$LIBS"
++
++	cdirs= clibs=
++	for i in $LIB_krb4; do
++		case "$i" in
++		-L*) cdirs="$cdirs $i";;
++		-l*) clibs="$clibs $i";;
++		esac
++	done
+ 
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++	ires=
++	for i in $INCLUDE_krb4; do
++		CFLAGS="-DHAVE_OPENSSL $i $save_CFLAGS"
++		for j in $cdirs; do
++			for k in $clibs; do
++				LIBS="$j $k $save_LIBS"
++				AC_TRY_LINK(test_headers, test_body,
++					openssl=yes ires="$i" lres="$j $k"; break 3)
++			done
++		done
++		CFLAGS="$i $save_CFLAGS"
++		for j in $cdirs; do
++			for k in $clibs; do
++				LIBS="$j $k $save_LIBS"
++				AC_TRY_LINK(test_headers, test_body,
++					openssl=no ires="$i" lres="$j $k"; break 3)
++			done
++		done
++		CFLAGS="-DHAVE_OLD_HASH_NAMES $i $save_CFLAGS"
++		for j in $cdirs; do
++			for k in $clibs; do
++				LIBS="$j $k $save_LIBS"
++				AC_TRY_LINK(test_headers, test_body,
++					openssl=no ires="$i" lres="$j $k"; break 3)
++			done
++		done
++	done
++		
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++	if test "$ires" -a "$lres"; then
++		INCLUDE_des="$ires"
++		LIB_des="$lres"
++		crypto_lib=krb4
++		AC_MSG_RESULT([same as krb4])
++		LIB_des_a='$(LIB_des)'
++		LIB_des_so='$(LIB_des)'
++		LIB_des_appl='$(LIB_des)'
++	fi
++fi
+ 
+-    hpux9*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	INCLUDE_des=
++	LIB_des=
++	if test "$with_openssl_include" != ""; then
++		INCLUDE_des="-I${with_openssl_include}"
++	fi
++	if test "$with_openssl_lib" != ""; then
++		LIB_des="-L${with_openssl_lib}"
++	fi
++	CFLAGS="-DHAVE_OPENSSL ${INCLUDE_des} ${CFLAGS}"
++	saved_LIB_des="$LIB_des"
++	for lres in "" "-lnsl -lsocket"; do
++		LIB_des="${saved_LIB_des} -lcrypto $lres"
++		LIB_des_a="$LIB_des"
++		LIB_des_so="$LIB_des"
++		LIB_des_appl="$LIB_des"
++		LIBS="${LIBS} ${LIB_des}"
++		AC_TRY_LINK(test_headers, test_body, [
++			crypto_lib=libcrypto openssl=yes
++			AC_MSG_RESULT([libcrypto])
++		])
++		if test "$crypto_lib" = libcrypto ; then
++			break;
++		fi
++	done
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
+ 
+-      # hardcode_minus_L: Not really in the search PATH,
+-      # but as the default location of the library.
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      ;;
++if test "$crypto_lib" = "unknown"; then
+ 
+-    hpux10* | hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-	  ;;
+-	esac
+-      else
+-	case "$host_cpu" in
+-	hppa*64*|ia64*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
+-	case "$host_cpu" in
+-	hppa*64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	  ;;
+-	ia64*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++  DIR_des='des'
++  LIB_des='$(top_builddir)/lib/des/libdes.la'
++  LIB_des_a='$(top_builddir)/lib/des/.libs/libdes.a'
++  LIB_des_so='$(top_builddir)/lib/des/.libs/libdes.so'
++  LIB_des_appl="-ldes"
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	*)
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++  AC_MSG_RESULT([included libdes])
+ 
+-	  # hardcode_minus_L: Not really in the search PATH,
+-	  # but as the default location of the library.
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  ;;
+-	esac
+-      fi
+-      ;;
++fi
++
++if test "$with_krb4" != no -a "$crypto_lib" != krb4; then
++	AC_MSG_ERROR([the crypto library used by krb4 lacks features
++required by Kerberos 5; to continue, you need to install a newer 
++Kerberos 4 or configure --without-krb4])
++fi
++
++if test "$openssl" = "yes"; then
++  AC_DEFINE([HAVE_OPENSSL], 1, [define to use openssl's libcrypto])
++fi
++if test "$old_hash" = yes; then
++  AC_DEFINE([HAVE_OLD_HASH_NAMES], 1,
++		[define if you have hash functions like md4_finito()])
++fi
++AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = yes)dnl
++
++AC_SUBST(DIR_des)
++AC_SUBST(INCLUDE_des)
++AC_SUBST(LIB_des)
++AC_SUBST(LIB_des_a)
++AC_SUBST(LIB_des_so)
++AC_SUBST(LIB_des_appl)
++])
++
++dnl
++dnl $Id: with-all.m4,v 1.1 2001/08/29 17:01:23 assar Exp $
++dnl
++
++dnl AC_WITH_ALL(name)
++
++AC_DEFUN([AC_WITH_ALL], [
++AC_ARG_WITH($1,
++	AC_HELP_STRING([--with-$1=dir],
++		[use $1 in dir]))
++
++AC_ARG_WITH($1-lib,
++	AC_HELP_STRING([--with-$1-lib=dir],
++		[use $1 libraries in dir]),
++[if test "$withval" = "yes" -o "$withval" = "no"; then
++  AC_MSG_ERROR([No argument for --with-$1-lib])
++elif test "X$with_$1" = "X"; then
++  with_$1=yes
++fi])
++
++AC_ARG_WITH($1-include,
++	AC_HELP_STRING([--with-$1-include=dir],
++		[use $1 headers in dir]),
++[if test "$withval" = "yes" -o "$withval" = "no"; then
++  AC_MSG_ERROR([No argument for --with-$1-include])
++elif test "X$with_$1" = "X"; then
++  with_$1=yes
++fi])
++
++case "$with_$1" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_$1_include" = ""; then
++		with_$1_include="$with_$1/include"
++	fi
++	if test "$with_$1_lib" = ""; then
++		with_$1_lib="$with_$1/lib$abilibdirext"
++	fi
++	;;
++esac
++])
++dnl $Id: db.m4,v 1.9 2002/09/10 14:29:47 joda Exp $
++dnl
++dnl tests for various db libraries
++dnl
++AC_DEFUN([rk_DB],[
++AC_ARG_ENABLE(berkeley-db,
++                       AC_HELP_STRING([--disable-berkeley-db],
++                                      [if you don't want berkeley db]),[
++])
++
++have_ndbm=no
++db_type=unknown
++
++if test "$enable_berkeley_db" != no; then
++
++  AC_CHECK_HEADERS([				\
++	db4/db.h				\
++	db3/db.h				\
++	db.h					\
++	db_185.h				\
++  ])
++
++dnl db_create is used by db3 and db4
++
++  AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [
++  #include <stdio.h>
++  #ifdef HAVE_DB4_DB_H
++  #include <db4/db.h>
++  #elif defined(HAVE_DB3_DB_H)
++  #include <db3/db.h>
++  #else
++  #include <db.h>
++  #endif
++  ],[NULL, NULL, 0])
++
++  if test "$ac_cv_func_db_create" = "yes"; then
++    db_type=db3
++    if test "$ac_cv_funclib_db_create" != "yes"; then
++      DBLIB="$ac_cv_funclib_db_create"
++    else
++      DBLIB=""
++    fi
++    AC_DEFINE(HAVE_DB3, 1, [define if you have a berkeley db3/4 library])
++  else
++
++dnl dbopen is used by db1/db2
+ 
+-    irix5* | irix6* | nonstopux*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [
++    #include <stdio.h>
++    #if defined(HAVE_DB2_DB_H)
++    #include <db2/db.h>
++    #elif defined(HAVE_DB_185_H)
++    #include <db_185.h>
++    #elif defined(HAVE_DB_H)
++    #include <db.h>
++    #else
++    #error no db.h
++    #endif
++    ],[NULL, 0, 0, 0, NULL])
++
++    if test "$ac_cv_func_dbopen" = "yes"; then
++      db_type=db1
++      if test "$ac_cv_funclib_dbopen" != "yes"; then
++        DBLIB="$ac_cv_funclib_dbopen"
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++        DBLIB=""
+       fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++      AC_DEFINE(HAVE_DB1, 1, [define if you have a berkeley db1/2 library])
++    fi
++  fi
+ 
+-    netbsd*)
+-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++dnl test for ndbm compatability
++
++  if test "$ac_cv_func_dbm_firstkey" != yes; then
++    AC_FIND_FUNC_NO_LIBS2(dbm_firstkey, $ac_cv_funclib_dbopen $ac_cv_funclib_db_create, [
++    #include <stdio.h>
++    #define DB_DBM_HSEARCH 1
++    #include <db.h>
++    DBM *dbm;
++    ],[NULL])
++  
++    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
++      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
++        LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+       else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++        LIB_NDBM=""
+       fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++      AC_DEFINE(HAVE_DB_NDBM, 1, [define if you have ndbm compat in db])
++      AC_DEFINE(HAVE_NEW_DB, 1, [Define if NDBM really is DB (creates files *.db)])
++    else
++      $as_unset ac_cv_func_dbm_firstkey
++      $as_unset ac_cv_funclib_dbm_firstkey
++    fi
++  fi
+ 
+-    newsos6)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++fi # berkeley db
+ 
+-    openbsd*)
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-      else
+-       case $host_os in
+-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-	   ;;
+-	 *)
+-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+-	   ;;
+-       esac
+-      fi
+-      ;;
++if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
+ 
+-    os2*)
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-      ;;
++  AC_CHECK_HEADERS([				\
++	dbm.h					\
++	ndbm.h					\
++  ])
+ 
+-    osf3*)
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++  AC_FIND_FUNC_NO_LIBS(dbm_firstkey, ndbm, [
++  #include <stdio.h>
++  #if defined(HAVE_NDBM_H)
++  #include <ndbm.h>
++  #elif defined(HAVE_DBM_H)
++  #include <dbm.h>
++  #endif
++  DBM *dbm;
++  ],[NULL])
++
++  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
++    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
++      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
++    else
++      LIB_NDBM=""
++    fi
++    AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
++    have_ndbm=yes
++    if test "$db_type" = "unknown"; then
++      db_type=ndbm
++      DBLIB="$LIB_NDBM"
++    fi
++  else
++
++    $as_unset ac_cv_func_dbm_firstkey
++    $as_unset ac_cv_funclib_dbm_firstkey
++
++    AC_CHECK_HEADERS([				\
++	  gdbm/ndbm.h				\
++    ])
++
++    AC_FIND_FUNC_NO_LIBS(dbm_firstkey, gdbm, [
++    #include <stdio.h>
++    #include <gdbm/ndbm.h>
++    DBM *dbm;
++    ],[NULL])
++
++    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
++      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
++	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
+       else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	LIB_NDBM=""
+       fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++      AC_DEFINE(HAVE_NDBM, 1, [define if you have a ndbm library])dnl
++      have_ndbm=yes
++      if test "$db_type" = "unknown"; then
++	db_type=ndbm
++	DBLIB="$LIB_NDBM"
++      fi
++    fi
++  fi
+ 
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+-      else
+-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++fi # unknown
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-      ;;
++if test "$have_ndbm" = "yes"; then
++  AC_MSG_CHECKING([if ndbm is implemented with db])
++  AC_TRY_RUN([
++#include <unistd.h>
++#include <fcntl.h>
++#if defined(HAVE_GDBM_NDBM_H)
++#include <gdbm/ndbm.h>
++#elif defined(HAVE_NDBM_H)
++#include <ndbm.h>
++#elif defined(HAVE_DBM_H)
++#include <dbm.h>
++#endif
++int main()
++{
++  DBM *d;
+ 
+-    sco3.2v5*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ;;
++  d = dbm_open("conftest", O_RDWR | O_CREAT, 0666);
++  if (d == NULL)
++    return 1;
++  dbm_close(d);
++  return 0;
++}],[
++    if test -f conftest.db; then
++      AC_MSG_RESULT([yes])
++      AC_DEFINE(HAVE_NEW_DB, 1, [Define if NDBM really is DB (creates files *.db)])
++    else
++      AC_MSG_RESULT([no])
++    fi],[AC_MSG_RESULT([no])])
++fi
+ 
+-    solaris*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      case $host_os in
+-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+-      esac
+-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-      ;;
++AM_CONDITIONAL(HAVE_DB1, test "$db_type" = db1)dnl
++AM_CONDITIONAL(HAVE_DB3, test "$db_type" = db3)dnl
++AM_CONDITIONAL(HAVE_NDBM, test "$db_type" = ndbm)dnl
++
++z=""
++for i in $LDFLAGS; do
++	case "$i" in
++	-L*) z="$z $i";;
++	esac
++done
++DBLIB="$z $DBLIB"
++AC_SUBST(DBLIB)dnl
++AC_SUBST(LIB_NDBM)dnl
++])
+ 
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-      fi
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++dnl $Id: roken.m4,v 1.3.8.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl try to look for an installed roken library with sufficient stuff
++dnl
++dnl set LIB_roken to the what we should link with
++dnl set DIR_roken to if the directory should be built
++dnl set CPPFLAGS_roken to stuff to add to CPPFLAGS
++
++dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppflags)
++AC_DEFUN([AC_ROKEN], [
++
++AC_ARG_WITH(roken,
++	AC_HELP_STRING([--with-roken=dir],[use the roken library in dir]),
++[if test "$withval" = "no"; then
++  AC_MSG_ERROR(roken is required)
++fi])
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
+-        ;;
+-	motorola)
+-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++save_CPPFLAGS="${CPPFLAGS}"
+ 
+-    sysv4.3*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+-      ;;
++case $with_roken in
++yes|"")
++  dirs="$2" ;;
++*)
++  dirs="$with_roken" ;;
++esac
+ 
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-      fi
+-      ;;
++roken_installed=no
+ 
+-    sysv4.2uw2*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      hardcode_runpath_var=yes
+-      runpath_var=LD_RUN_PATH
+-      ;;
++for i in $dirs; do
+ 
+-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+-      if test "$GCC" = yes; then
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      fi
+-      runpath_var='LD_RUN_PATH'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++AC_MSG_CHECKING(for roken in $i)
++
++CPPFLAGS="-I$i/include ${CPPFLAGS}"
++
++AC_TRY_CPP(
++[#include <roken.h>
++//#if ROKEN_VERSION < $1
++//#error old roken version, should be $1
++//fail
++//#endif
++],[roken_installed=yes; break])
++
++AC_MSG_RESULT($roken_installed)
++
++done
++
++CPPFLAGS="$save_CPPFLAGS"
++
++if test "$roken_installed" != "yes"; then
++  DIR_roken="roken"
++  LIB_roken='$4'
++  CPPFLAGS_roken='$5'
++dnl  AC_CONFIG_SUBDIRS(lib/roken)
++else
++  LIB_roken="$i/lib/libroken.la"
++  CPPFLAGS_roken="-I$i/include"
++fi
++
++AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl
++LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++
++AC_SUBST(LIB_roken)dnl
++AC_SUBST(DIR_roken)dnl
++AC_SUBST(CPPFLAGS_roken)dnl
++])
++
++dnl $Id: roken-frag.m4,v 1.45.2.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl some code to get roken working
++dnl
++dnl rk_ROKEN(subdir)
++dnl
++AC_DEFUN([rk_ROKEN], [
++
++AC_REQUIRE([rk_CONFIG_HEADER])
++
++dnl DIR_roken=roken
++dnl LIB_roken='$(top_builddir)/$1/libroken.la'
++dnl INCLUDES_roken='-I$(top_builddir)/$1 -I$(top_srcdir)/$1'
++
++dnl Checks for programs
++AC_REQUIRE([AC_PROG_CC])
++AC_REQUIRE([AC_PROG_AWK])
++AC_REQUIRE([AC_OBJEXT])
++AC_REQUIRE([AC_EXEEXT])
++AC_REQUIRE([AC_PROG_LIBTOOL])
++
++AC_REQUIRE([AC_MIPS_ABI])
++
++dnl C characteristics
++
++AC_REQUIRE([AC_C___ATTRIBUTE__])
++AC_REQUIRE([AC_C_INLINE])
++AC_REQUIRE([AC_C_CONST])
++AC_WFLAGS(-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs)
++
++AC_REQUIRE([rk_DB])
++
++dnl C types
++
++AC_REQUIRE([AC_TYPE_SIZE_T])
++AC_HAVE_TYPE([ssize_t],[#include <unistd.h>])
++AC_REQUIRE([AC_TYPE_PID_T])
++AC_REQUIRE([AC_TYPE_UID_T])
++AC_HAVE_TYPE([long long])
++
++AC_REQUIRE([rk_RETSIGTYPE])
++
++dnl Checks for header files.
++AC_REQUIRE([AC_HEADER_STDC])
++AC_REQUIRE([AC_HEADER_TIME])
++
++AC_CHECK_HEADERS([\
++	arpa/inet.h				\
++	arpa/nameser.h				\
++	config.h				\
++	crypt.h					\
++	dirent.h				\
++	errno.h					\
++	err.h					\
++	fcntl.h					\
++	grp.h					\
++	ifaddrs.h				\
++	net/if.h				\
++	netdb.h					\
++	netinet/in.h				\
++	netinet/in6.h				\
++	netinet/in_systm.h			\
++	netinet6/in6.h				\
++	netinet6/in6_var.h			\
++	paths.h					\
++	pwd.h					\
++	resolv.h				\
++	rpcsvc/ypclnt.h				\
++	shadow.h				\
++	sys/bswap.h				\
++	sys/ioctl.h				\
++	sys/mman.h				\
++	sys/param.h				\
++	sys/proc.h				\
++	sys/resource.h				\
++	sys/socket.h				\
++	sys/sockio.h				\
++	sys/stat.h				\
++	sys/sysctl.h				\
++	sys/time.h				\
++	sys/tty.h				\
++	sys/types.h				\
++	sys/uio.h				\
++	sys/utsname.h				\
++	sys/wait.h				\
++	syslog.h				\
++	termios.h				\
++	unistd.h				\
++	userconf.h				\
++	usersec.h				\
++	util.h					\
++	vis.h					\
++])
++	
++AC_REQUIRE([CHECK_NETINET_IP_AND_TCP])
++
++AM_CONDITIONAL(have_err_h, test "$ac_cv_header_err_h" = yes)
++AM_CONDITIONAL(have_fnmatch_h, test "$ac_cv_header_fnmatch_h" = yes)
++AM_CONDITIONAL(have_ifaddrs_h, test "$ac_cv_header_ifaddrs_h" = yes)
++AM_CONDITIONAL(have_vis_h, test "$ac_cv_header_vis_h" = yes)
++
++dnl Check for functions and libraries
++
++AC_FIND_FUNC(socket, socket)
++AC_FIND_FUNC(gethostbyname, nsl)
++AC_FIND_FUNC(syslog, syslog)
++
++AC_KRB_IPV6
++
++AC_FIND_FUNC(gethostbyname2, inet6 ip6)
++
++AC_FIND_FUNC(res_search, resolv,
++[
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++],
++[0,0,0,0,0])
++
++AC_FIND_FUNC(res_nsearch, resolv,
++[
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++],
++[0,0,0,0,0,0])
++
++AC_FIND_FUNC(dn_expand, resolv,
++[
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++],
++[0,0,0,0,0])
++
++rk_CHECK_VAR(_res, 
++[#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif])
++
++
++AC_BROKEN_SNPRINTF
++AC_BROKEN_VSNPRINTF
++
++AC_BROKEN_GLOB
++if test "$ac_cv_func_glob_working" != yes; then
++	AC_LIBOBJ(glob)
++fi
++AM_CONDITIONAL(have_glob_h, test "$ac_cv_func_glob_working" = yes)
++
++
++AC_CHECK_FUNCS([				\
++	asnprintf				\
++	asprintf				\
++	atexit					\
++	cgetent					\
++	getconfattr				\
++	getprogname				\
++	getrlimit				\
++	getspnam				\
++	initstate				\
++	issetugid				\
++	on_exit					\
++	random					\
++	setprogname				\
++	setstate				\
++	strsvis					\
++	strunvis				\
++	strvis					\
++	strvisx					\
++	svis					\
++	sysconf					\
++	sysctl					\
++	uname					\
++	unvis					\
++	vasnprintf				\
++	vasprintf				\
++	vis					\
++])
++
++if test "$ac_cv_func_cgetent" = no; then
++	AC_LIBOBJ(getcap)
++fi
+ 
+-    sysv5*)
+-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+-      # $CC -shared without GNU ld will not create a library from C++
+-      # object files and a static libstdc++, better avoid it by now
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      runpath_var='LD_RUN_PATH'
+-      ;;
++AC_REQUIRE([AC_FUNC_GETLOGIN])
+ 
+-    uts4*)
+-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-      ;;
++AC_REQUIRE([AC_FUNC_MMAP])
+ 
+-    *)
+-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-      ;;
+-    esac
+-  fi
++AC_FIND_FUNC_NO_LIBS(getsockopt,,
++[#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif],
++[0,0,0,0,0])
++AC_FIND_FUNC_NO_LIBS(setsockopt,,
++[#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif],
++[0,0,0,0,0])
++
++AC_FIND_IF_NOT_BROKEN(hstrerror, resolv,
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif],
++17)
++AC_NEED_PROTO([
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif],
++hstrerror)
++
++AC_FOREACH([rk_func], [asprintf vasprintf asnprintf vasnprintf],
++	[AC_NEED_PROTO([
++	#include <stdio.h>
++	#include <string.h>],
++	rk_func)])
++
++AC_FIND_FUNC_NO_LIBS(bswap16,,
++[#ifdef HAVE_SYS_BSWAP_H
++#include <sys/bswap.h>
++#endif],0)
++
++AC_FIND_FUNC_NO_LIBS(bswap32,,
++[#ifdef HAVE_SYS_BSWAP_H
++#include <sys/bswap.h>
++#endif],0)
++
++AC_FIND_FUNC_NO_LIBS(pidfile,util,
++[#ifdef HAVE_UTIL_H
++#include <util.h>
++#endif],0)
++
++AC_FIND_IF_NOT_BROKEN(getaddrinfo,,
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif],[0,0,0,0])
++
++AC_FIND_IF_NOT_BROKEN(getnameinfo,,
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif],[0,0,0,0,0,0,0])
++
++AC_FIND_IF_NOT_BROKEN(freeaddrinfo,,
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif],[0])
++
++AC_FIND_IF_NOT_BROKEN(gai_strerror,,
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif],[0])
++
++AC_BROKEN([					\
++	chown					\
++	copyhostent				\
++	daemon					\
++	ecalloc					\
++	emalloc					\
++	erealloc				\
++	estrdup					\
++	err					\
++	errx					\
++	fchown					\
++	flock					\
++	fnmatch					\
++	freehostent				\
++	getcwd					\
++	getdtablesize				\
++	getegid					\
++	geteuid					\
++	getgid					\
++	gethostname				\
++	getifaddrs				\
++	getipnodebyaddr				\
++	getipnodebyname				\
++	getopt					\
++	gettimeofday				\
++	getuid					\
++	getusershell				\
++	initgroups				\
++	innetgr					\
++	iruserok				\
++	localtime_r				\
++	lstat					\
++	memmove					\
++	mkstemp					\
++	putenv					\
++	rcmd					\
++	readv					\
++	recvmsg					\
++	sendmsg					\
++	setegid					\
++	setenv					\
++	seteuid					\
++	strcasecmp				\
++	strdup					\
++	strerror				\
++	strftime				\
++	strlcat					\
++	strlcpy					\
++	strlwr					\
++	strncasecmp				\
++	strndup					\
++	strnlen					\
++	strptime				\
++	strsep					\
++	strsep_copy				\
++	strtok_r				\
++	strupr					\
++	swab					\
++	unsetenv				\
++	verr					\
++	verrx					\
++	vsyslog					\
++	vwarn					\
++	vwarnx					\
++	warn					\
++	warnx					\
++	writev					\
+ ])
+-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
++AC_FOREACH([rk_func], [strndup strsep strtok_r],
++	[AC_NEED_PROTO([#include <string.h>], rk_func)])
+ 
+-#
+-# Do we need to explicitly link libc?
+-#
+-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+-x|xyes)
+-  # Assume -lc should be added
+-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++AC_FOREACH([rk_func], [strsvis strunvis strvis strvisx svis unvis vis],
++[AC_NEED_PROTO([#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif], rk_func)])
++
++AC_BROKEN2(inet_aton,
++[#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif],
++[0,0])
++
++AC_BROKEN2(inet_ntop,
++[#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif],
++[0, 0, 0, 0])
++
++AC_BROKEN2(inet_pton,
++[#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif],
++[0,0,0])
+ 
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
+-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+-    *'~'*)
+-      # FIXME: we may have to deal with multi-command sequences.
+-      ;;
+-    '$CC '*)
+-      # Test whether the compiler implicitly links with -lc since on some
+-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-      # to ld, don't add -lc before -lgcc.
+-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+-      $rm conftest*
+-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++dnl
++dnl Check for sa_len in struct sockaddr, 
++dnl needs to come before the getnameinfo test
++dnl
++AC_HAVE_STRUCT_FIELD(struct sockaddr, sa_len, [#include <sys/types.h>
++#include <sys/socket.h>])
+ 
+-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
+-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
+-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-        then
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-        else
+-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+-        fi
+-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+-      else
+-        cat conftest.err 1>&5
+-      fi
+-      $rm conftest*
+-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+-      ;;
+-    esac
++if test "$ac_cv_func_getnameinfo" = "yes"; then
++  rk_BROKEN_GETNAMEINFO
++  if test "$ac_cv_func_getnameinfo_broken" = yes; then
++	AC_LIBOBJ(getnameinfo)
+   fi
+-  ;;
+-esac
+-])# AC_LIBTOOL_PROG_LD_SHLIBS
++fi
+ 
++if test "$ac_cv_func_getaddrinfo" = "yes"; then
++  rk_BROKEN_GETADDRINFO
++  if test "$ac_cv_func_getaddrinfo_numserv" = no; then
++	AC_LIBOBJ(getaddrinfo)
++	AC_LIBOBJ(freeaddrinfo)
++  fi
++fi
+ 
+-# _LT_AC_FILE_LTDLL_C
+-# -------------------
+-# Be careful that the start marker always follows a newline.
+-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-])# _LT_AC_FILE_LTDLL_C
++AC_NEED_PROTO([#include <stdlib.h>], setenv)
++AC_NEED_PROTO([#include <stdlib.h>], unsetenv)
++AC_NEED_PROTO([#include <unistd.h>], gethostname)
++AC_NEED_PROTO([#include <unistd.h>], mkstemp)
++AC_NEED_PROTO([#include <unistd.h>], getusershell)
+ 
++AC_NEED_PROTO([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif],
++inet_aton)
+ 
+-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl
+ 
++AC_REQUIRE([rk_BROKEN_REALLOC])dnl
+ 
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
++dnl AC_KRB_FUNC_GETCWD_BROKEN
+ 
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
++dnl
++dnl Checks for prototypes and declarations
++dnl
+ 
+-AC_DEFUN([LT_AC_PROG_GCJ],
+-[AC_CHECK_TOOL(GCJ, gcj, no)
+-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+-  AC_SUBST(GCJFLAGS)
+-])
++AC_PROTO_COMPAT([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++],
++gethostbyname, struct hostent *gethostbyname(const char *))
+ 
+-AC_DEFUN([LT_AC_PROG_RC],
+-[AC_CHECK_TOOL(RC, windres, no)
+-])
++AC_PROTO_COMPAT([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++],
++gethostbyaddr, struct hostent *gethostbyaddr(const void *, size_t, int))
+ 
+-# NOTE: This macro has been submitted for inclusion into   #
+-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+-#  a released version of Autoconf we should remove this    #
+-#  macro and use it instead.                               #
+-# LT_AC_PROG_SED
+-# --------------
+-# Check for a fully-functional sed program, that truncates
+-# as few characters as possible.  Prefer GNU sed if found.
+-AC_DEFUN([LT_AC_PROG_SED],
+-[AC_MSG_CHECKING([for a sed that does not truncate output])
+-AC_CACHE_VAL(lt_cv_path_SED,
+-[# Loop through the user's path and test for sed and gsed.
+-# Then use that list of sed's as ones to test for truncation.
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for lt_ac_prog in sed gsed; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+-      fi
+-    done
+-  done
+-done
+-lt_ac_max=0
+-lt_ac_count=0
+-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-# along with /bin/sed that truncates output.
+-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && break
+-  cat /dev/null > conftest.in
+-  lt_ac_count=0
+-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+-  # Check for GNU sed and select it if it is found.
+-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+-    lt_cv_path_SED=$lt_ac_sed
+-    break
+-  fi
+-  while true; do
+-    cat conftest.in conftest.in >conftest.tmp
+-    mv conftest.tmp conftest.in
+-    cp conftest.in conftest.nl
+-    echo >>conftest.nl
+-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+-    cmp -s conftest.out conftest.nl || break
+-    # 10000 chars as input seems more than enough
+-    test $lt_ac_count -gt 10 && break
+-    lt_ac_count=`expr $lt_ac_count + 1`
+-    if test $lt_ac_count -gt $lt_ac_max; then
+-      lt_ac_max=$lt_ac_count
+-      lt_cv_path_SED=$lt_ac_sed
+-    fi
+-  done
+-done
+-SED=$lt_cv_path_SED
++AC_PROTO_COMPAT([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++],
++getservbyname, struct servent *getservbyname(const char *, const char *))
++
++AC_PROTO_COMPAT([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++],
++getsockname, int getsockname(int, struct sockaddr*, socklen_t*))
++
++AC_PROTO_COMPAT([
++#ifdef HAVE_SYSLOG_H
++#include <syslog.h>
++#endif
++],
++openlog, void openlog(const char *, int, int))
++
++AC_NEED_PROTO([
++#ifdef HAVE_CRYPT_H
++#include <crypt.h>
++#endif
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++],
++crypt)
++
++dnl variables
++
++rk_CHECK_VAR(h_errno, 
++[#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif])
++
++rk_CHECK_VAR(h_errlist, 
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif])
++
++rk_CHECK_VAR(h_nerr, 
++[#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif])
++
++rk_CHECK_VAR([__progname], 
++[#ifdef HAVE_ERR_H
++#include <err.h>
++#endif])
++
++AC_CHECK_DECLARATION([#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif], optarg)
++AC_CHECK_DECLARATION([#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif], optind)
++AC_CHECK_DECLARATION([#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif], opterr)
++AC_CHECK_DECLARATION([#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif], optopt)
++
++AC_CHECK_DECLARATION([#include <stdlib.h>], environ)
++
++dnl
++dnl Check for fields in struct tm
++dnl
++
++AC_HAVE_STRUCT_FIELD(struct tm, tm_gmtoff, [#include <time.h>])
++AC_HAVE_STRUCT_FIELD(struct tm, tm_zone, [#include <time.h>])
++
++dnl
++dnl or do we have a variable `timezone' ?
++dnl
++
++rk_CHECK_VAR(timezone,[#include <time.h>])
++rk_CHECK_VAR(altzone,[#include <time.h>])
++
++AC_HAVE_TYPE([sa_family_t],[#include <sys/socket.h>])
++AC_HAVE_TYPE([socklen_t],[#include <sys/socket.h>])
++AC_HAVE_TYPE([struct sockaddr], [#include <sys/socket.h>])
++AC_HAVE_TYPE([struct sockaddr_storage], [#include <sys/socket.h>])
++AC_HAVE_TYPE([struct addrinfo], [#include <netdb.h>])
++AC_HAVE_TYPE([struct ifaddrs], [#include <ifaddrs.h>])
++AC_HAVE_TYPE([struct iovec],[
++#include <sys/types.h>
++#include <sys/uio.h>
+ ])
+-AC_MSG_RESULT([$SED])
++AC_HAVE_TYPE([struct msghdr],[
++#include <sys/types.h>
++#include <sys/socket.h>
+ ])
+ 
+-#                                                        -*- Autoconf -*-
+-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl
++dnl Check for struct winsize
++dnl
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++AC_KRB_STRUCT_WINSIZE
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++dnl
++dnl Check for struct spwd
++dnl
+ 
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
++AC_KRB_STRUCT_SPWD
+ 
+-# AM_SET_CURRENT_AUTOMAKE_VERSION
+-# -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.8.3])])
++dnl won't work with automake
++dnl moved to AC_OUTPUT in configure.in
++dnl AC_CONFIG_FILES($1/Makefile)
+ 
+-# AM_AUX_DIR_EXPAND
++dnl LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++dnl AC_SUBST(DIR_roken)dnl
++dnl AC_SUBST(LIB_roken)dnl
++dnl AC_SUBST(INCLUDES_roken)dnl
++])
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl $Id: have-type.m4,v 1.6.12.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl check for existance of a type
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++dnl AC_HAVE_TYPE(TYPE,INCLUDES)
++AC_DEFUN([AC_HAVE_TYPE], [
++AC_REQUIRE([AC_HEADER_STDC])
++cv=`echo "$1" | sed 'y%./+- %__p__%'`
++AC_MSG_CHECKING(for $1)
++AC_CACHE_VAL([ac_cv_type_$cv],
++AC_TRY_COMPILE(
++[#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++$2],
++[$1 foo;],
++eval "ac_cv_type_$cv=yes",
++eval "ac_cv_type_$cv=no"))dnl
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++AC_MSG_RESULT($ac_foo)
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	AC_CHECK_TYPES($1)
++fi
++  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
++fi
++])
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++dnl
++dnl $Id: retsigtype.m4,v 1.1.12.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl Figure out return type of signal handlers, and define SIGRETURN macro
++dnl that can be used to return from one
++dnl
++AC_DEFUN([rk_RETSIGTYPE],[
++AC_TYPE_SIGNAL
++if test "$ac_cv_type_signal" = "void" ; then
++	AC_DEFINE(VOID_RETSIGTYPE, 1, [Define if signal handlers return void.])
++fi
++AC_SUBST(VOID_RETSIGTYPE)
++AH_BOTTOM([#ifdef VOID_RETSIGTYPE
++#define SIGRETURN(x) return
++#else
++#define SIGRETURN(x) return (RETSIGTYPE)(x)
++#endif])
++])
++dnl
++dnl $Id: check-netinet-ip-and-tcp.m4,v 1.3.12.1 2004/04/01 07:27:33 joda Exp $
++dnl
+ 
+-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+-#
+-# Of course, Automake must honor this variable whenever it calls a
+-# tool from the auxiliary directory.  The problem is that $srcdir (and
+-# therefore $ac_aux_dir as well) can be either absolute or relative,
+-# depending on how configure is run.  This is pretty annoying, since
+-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+-# source directory, any form will work fine, but in subdirectories a
+-# relative path needs to be adjusted first.
+-#
+-# $ac_aux_dir/missing
+-#    fails when called from a subdirectory if $ac_aux_dir is relative
+-# $top_srcdir/$ac_aux_dir/missing
+-#    fails if $ac_aux_dir is absolute,
+-#    fails when called from a subdirectory in a VPATH build with
+-#          a relative $ac_aux_dir
+-#
+-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+-# are both prefixed by $srcdir.  In an in-source build this is usually
+-# harmless because $srcdir is `.', but things will broke when you
+-# start a VPATH build or use an absolute $srcdir.
+-#
+-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+-# and then we would define $MISSING as
+-#   MISSING="\${SHELL} $am_aux_dir/missing"
+-# This will work as long as MISSING is not called from configure, because
+-# unfortunately $(top_srcdir) has no meaning in configure.
+-# However there are other variables, like CC, which are often used in
+-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+-#
+-# Another solution, used here, is to always expand $ac_aux_dir to an
+-# absolute PATH.  The drawback is that using absolute paths prevent a
+-# configured tree to be moved without reconfiguration.
++dnl extra magic check for netinet/{ip.h,tcp.h} because on irix 6.5.3
++dnl you have to include standards.h before including these files
+ 
+-AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[dnl Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])dnl
+-# expand $ac_aux_dir to an absolute path
+-am_aux_dir=`cd $ac_aux_dir && pwd`
+-])
++AC_DEFUN([CHECK_NETINET_IP_AND_TCP],
++[
++AC_CHECK_HEADERS(standards.h)
++for i in netinet/ip.h netinet/tcp.h; do
+ 
+-# AM_CONDITIONAL                                              -*- Autoconf -*-
++cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++AC_CACHE_CHECK([for $i],ac_cv_header_$cv,
++[AC_TRY_CPP([\
++#ifdef HAVE_STANDARDS_H
++#include <standards.h>
++#endif
++#include <$i>
++],
++eval "ac_cv_header_$cv=yes",
++eval "ac_cv_header_$cv=no")])
++ac_res=`eval echo \\$ac_cv_header_$cv`
++if test "$ac_res" = yes; then
++	ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++	AC_DEFINE_UNQUOTED($ac_tr_hdr, 1)
++fi
++done
++if false;then
++	AC_CHECK_HEADERS(netinet/ip.h netinet/tcp.h)
++fi
++])
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl $Id: krb-ipv6.m4,v 1.13.8.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl test for IPv6
++dnl
++AC_DEFUN([AC_KRB_IPV6], [
++AC_ARG_WITH(ipv6,
++	AC_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
++if test "$withval" = "no"; then
++	ac_cv_lib_ipv6=no
++fi])
++save_CFLAGS="${CFLAGS}"
++AC_CACHE_CHECK([for IPv6 stack type], v6type,
++[dnl check for different v6 implementations (by itojun)
++v6type=unknown
++v6lib=none
++
++for i in v6d toshiba kame inria zeta linux; do
++	case $i in
++	v6d)
++		AC_EGREP_CPP(yes, [
++#include </usr/local/v6/include/sys/types.h>
++#ifdef __V6D__
++yes
++#endif],
++			[v6type=$i; v6lib=v6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-I/usr/local/v6/include $CFLAGS"])
++		;;
++	toshiba)
++		AC_EGREP_CPP(yes, [
++#include <sys/param.h>
++#ifdef _TOSHIBA_INET6
++yes
++#endif],
++			[v6type=$i; v6lib=inet6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-DINET6 $CFLAGS"])
++		;;
++	kame)
++		AC_EGREP_CPP(yes, [
++#include <netinet/in.h>
++#ifdef __KAME__
++yes
++#endif],
++			[v6type=$i; v6lib=inet6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-DINET6 $CFLAGS"])
++		;;
++	inria)
++		AC_EGREP_CPP(yes, [
++#include <netinet/in.h>
++#ifdef IPV6_INRIA_VERSION
++yes
++#endif],
++			[v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
++		;;
++	zeta)
++		AC_EGREP_CPP(yes, [
++#include <sys/param.h>
++#ifdef _ZETA_MINAMI_INET6
++yes
++#endif],
++			[v6type=$i; v6lib=inet6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-DINET6 $CFLAGS"])
++		;;
++	linux)
++		if test -d /usr/inet6; then
++			v6type=$i
++			v6lib=inet6
++			v6libdir=/usr/inet6
++			CFLAGS="-DINET6 $CFLAGS"
++		fi
++		;;
++	esac
++	if test "$v6type" != "unknown"; then
++		break
++	fi
++done
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++if test "$v6lib" != "none"; then
++	for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
++		if test -d $dir -a -f $dir/lib$v6lib.a; then
++			LIBS="-L$dir -l$v6lib $LIBS"
++			break
++		fi
++	done
++fi
++])
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++AC_CACHE_CHECK([for IPv6], ac_cv_lib_ipv6, [
++AC_TRY_LINK([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_NETINET_IN6_H
++#include <netinet/in6.h>
++#endif
++],
++[
++ struct sockaddr_in6 sin6;
++ int s;
+ 
+-# serial 6
++ s = socket(AF_INET6, SOCK_DGRAM, 0);
+ 
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ(2.52)dnl
+- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
+-if $2; then
+-  $1_TRUE=
+-  $1_FALSE='#'
++ sin6.sin6_family = AF_INET6;
++ sin6.sin6_port = htons(17);
++ sin6.sin6_addr = in6addr_any;
++ bind(s, (struct sockaddr *)&sin6, sizeof(sin6));
++],
++ac_cv_lib_ipv6=yes,
++ac_cv_lib_ipv6=no)])
++if test "$ac_cv_lib_ipv6" = yes; then
++  AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.])
+ else
+-  $1_TRUE='#'
+-  $1_FALSE=
++  CFLAGS="${save_CFLAGS}"
+ fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+-  AC_MSG_ERROR([conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.])
+-fi])])
+ 
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
++if test "$ac_cv_lib_ipv6" = yes; then
++	AC_CACHE_CHECK([for in6addr_loopback],[ac_cv_var_in6addr_loopback],[
++	AC_TRY_LINK([
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_NETINET_IN6_H
++#include <netinet/in6.h>
++#endif],[
++struct sockaddr_in6 sin6;
++sin6.sin6_addr = in6addr_loopback;
++],ac_cv_var_in6addr_loopback=yes,ac_cv_var_in6addr_loopback=no)])
++	if test "$ac_cv_var_in6addr_loopback" = yes; then
++		AC_DEFINE(HAVE_IN6ADDR_LOOPBACK, 1, 
++			[Define if you have the in6addr_loopback variable])
++	fi
++fi
++])
++dnl $Id: check-var.m4,v 1.7 2003/02/17 00:44:57 lha Exp $
++dnl
++dnl rk_CHECK_VAR(variable, includes)
++AC_DEFUN([rk_CHECK_VAR], [
++AC_MSG_CHECKING(for $1)
++AC_CACHE_VAL(ac_cv_var_$1, [
++m4_ifval([$2],[
++	AC_TRY_LINK([$2
++	void * foo() { return &$1; }],
++	    [foo()],
++	    ac_cv_var_$1=yes, ac_cv_var_$1=no)])
++if test "$ac_cv_var_$1" != yes ; then
++AC_TRY_LINK([extern int $1;
++int foo() { return $1; }],
++	    [foo()],
++	    ac_cv_var_$1=yes, ac_cv_var_$1=no)
++fi
++])
++ac_foo=`eval echo \\$ac_cv_var_$1`
++AC_MSG_RESULT($ac_foo)
++if test "$ac_foo" = yes; then
++	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
++		[Define if you have the `]$1[' variable.])
++	m4_ifval([$2], AC_CHECK_DECLARATION([$2],[$1]))
++fi
++])
+ 
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++AC_WARNING_ENABLE([obsolete])
++AU_DEFUN([AC_CHECK_VAR], [rk_CHECK_VAR([$2], [$1])], [foo])
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl $Id: check-declaration.m4,v 1.3.34.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl
++dnl Check if we need the declaration of a variable
++dnl
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++dnl AC_HAVE_DECLARATION(includes, variable)
++AC_DEFUN([AC_CHECK_DECLARATION], [
++AC_MSG_CHECKING([if $2 is properly declared])
++AC_CACHE_VAL(ac_cv_var_$2_declaration, [
++AC_TRY_COMPILE([$1
++extern struct { int foo; } $2;],
++[$2.foo = 1;],
++eval "ac_cv_var_$2_declaration=no",
++eval "ac_cv_var_$2_declaration=yes")
++])
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++define(foo, [HAVE_]translit($2, [a-z], [A-Z])[_DECLARATION])
+ 
+-# serial 7
++AC_MSG_RESULT($ac_cv_var_$2_declaration)
++if eval "test \"\$ac_cv_var_$2_declaration\" = yes"; then
++	AC_DEFINE(foo, 1, [define if your system declares $2])
++fi
++undefine([foo])
++])
+ 
+-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++dnl $Id: broken-snprintf.m4,v 1.4.10.1 2004/04/01 07:27:32 joda Exp $
++dnl
++AC_DEFUN([AC_BROKEN_SNPRINTF], [
++AC_CACHE_CHECK(for working snprintf,ac_cv_func_snprintf_working,
++ac_cv_func_snprintf_working=yes
++AC_TRY_RUN([
++#include <stdio.h>
++#include <string.h>
++int main()
++{
++	char foo[[3]];
++	snprintf(foo, 2, "12");
++	return strcmp(foo, "1");
++}],:,ac_cv_func_snprintf_working=no,:))
+ 
+-# Do all the work for Automake.                            -*- Autoconf -*-
++if test "$ac_cv_func_snprintf_working" = yes; then
++	AC_DEFINE_UNQUOTED(HAVE_SNPRINTF, 1, [define if you have a working snprintf])
++fi
++if test "$ac_cv_func_snprintf_working" = yes; then
++AC_NEED_PROTO([#include <stdio.h>],snprintf)
++fi
++])
+ 
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things.  But this isn't really a big deal.
++AC_DEFUN([AC_BROKEN_VSNPRINTF],[
++AC_CACHE_CHECK(for working vsnprintf,ac_cv_func_vsnprintf_working,
++ac_cv_func_vsnprintf_working=yes
++AC_TRY_RUN([
++#include <stdio.h>
++#include <string.h>
++#include <stdarg.h>
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++int foo(int num, ...)
++{
++	char bar[[3]];
++	va_list arg;
++	va_start(arg, num);
++	vsnprintf(bar, 2, "%s", arg);
++	va_end(arg);
++	return strcmp(bar, "1");
++}
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++int main()
++{
++	return foo(0, "12");
++}],:,ac_cv_func_vsnprintf_working=no,:))
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++if test "$ac_cv_func_vsnprintf_working" = yes; then
++	AC_DEFINE_UNQUOTED(HAVE_VSNPRINTF, 1, [define if you have a working vsnprintf])
++fi
++if test "$ac_cv_func_vsnprintf_working" = yes; then
++AC_NEED_PROTO([#include <stdio.h>],vsnprintf)
++fi
++])
+ 
+-# serial 11
++dnl $Id: need-proto.m4,v 1.4.6.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl
++dnl Check if we need the prototype for a function
++dnl
+ 
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition.  After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
+-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++dnl AC_NEED_PROTO(includes, function)
++
++AC_DEFUN([AC_NEED_PROTO], [
++if test "$ac_cv_func_$2+set" != set -o "$ac_cv_func_$2" = yes; then
++AC_CACHE_CHECK([if $2 needs a prototype], ac_cv_func_$2_noproto,
++AC_TRY_COMPILE([$1],
++[struct foo { int foo; } xx;
++extern int $2 (struct foo*);
++$2(&xx);
++],
++eval "ac_cv_func_$2_noproto=yes",
++eval "ac_cv_func_$2_noproto=no"))
++if test "$ac_cv_func_$2_noproto" = yes; then
++	AC_DEFINE(AS_TR_CPP(NEED_[]$2[]_PROTO), 1,
++		[define if the system is missing a prototype for $2()])
++fi
+ fi
++])
+ 
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+-  if (cygpath --version) >/dev/null 2>/dev/null; then
+-    CYGPATH_W='cygpath -w'
+-  else
+-    CYGPATH_W=echo
+-  fi
++dnl $Id: broken-glob.m4,v 1.4.12.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl check for glob(3)
++dnl
++AC_DEFUN([AC_BROKEN_GLOB],[
++AC_CACHE_CHECK(for working glob, ac_cv_func_glob_working,
++ac_cv_func_glob_working=yes
++AC_TRY_LINK([
++#include <stdio.h>
++#include <glob.h>],[
++glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
++#ifdef GLOB_MAXPATH
++GLOB_MAXPATH
++#else
++GLOB_LIMIT
++#endif
++,
++NULL, NULL);
++],:,ac_cv_func_glob_working=no,:))
++
++if test "$ac_cv_func_glob_working" = yes; then
++	AC_DEFINE(HAVE_GLOB, 1, [define if you have a glob() that groks 
++	GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT])
++fi
++if test "$ac_cv_func_glob_working" = yes; then
++AC_NEED_PROTO([#include <stdio.h>
++#include <glob.h>],glob)
++fi
++])
++
++dnl
++dnl $Id: krb-func-getlogin.m4,v 1.1.32.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl test for POSIX (broken) getlogin
++dnl
++
++
++AC_DEFUN([AC_FUNC_GETLOGIN], [
++AC_CHECK_FUNCS(getlogin setlogin)
++if test "$ac_cv_func_getlogin" = yes; then
++AC_CACHE_CHECK(if getlogin is posix, ac_cv_func_getlogin_posix, [
++if test "$ac_cv_func_getlogin" = yes -a "$ac_cv_func_setlogin" = yes; then
++	ac_cv_func_getlogin_posix=no
++else
++	ac_cv_func_getlogin_posix=yes
++fi
++])
++if test "$ac_cv_func_getlogin_posix" = yes; then
++	AC_DEFINE(POSIX_GETLOGIN, 1, [Define if getlogin has POSIX flavour (and not BSD).])
++fi
++fi
++])
++
++dnl $Id: find-if-not-broken.m4,v 1.4.8.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl
++dnl Mix between AC_FIND_FUNC and AC_BROKEN
++dnl
++
++AC_DEFUN([AC_FIND_IF_NOT_BROKEN],
++[AC_FIND_FUNC([$1], [$2], [$3], [$4])
++if eval "test \"$ac_cv_func_$1\" != yes"; then 
++	rk_LIBOBJ([$1])
+ fi
+-AC_SUBST([CYGPATH_W])
++])
+ 
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++dnl $Id: broken.m4,v 1.6 2002/05/19 19:36:52 joda Exp $
++dnl
++dnl
++dnl Same as AC _REPLACE_FUNCS, just define HAVE_func if found in normal
++dnl libraries 
+ 
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++AC_DEFUN([AC_BROKEN],
++[AC_FOREACH([rk_func], [$1],
++	[AC_CHECK_FUNC(rk_func,
++		[AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]rk_func), 1, 
++			[Define if you have the function `]rk_func['.])],
++		[rk_LIBOBJ(rk_func)])])])
+ 
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_MISSING_PROG(AMTAR, tar)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target.  The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++dnl $Id: broken2.m4,v 1.4 2002/05/19 22:16:46 joda Exp $
++dnl
++dnl AC_BROKEN but with more arguments
+ 
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+-                  [_AM_DEPENDENCIES(CC)],
+-                  [define([AC_PROG_CC],
+-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-                  [_AM_DEPENDENCIES(CXX)],
+-                  [define([AC_PROG_CXX],
+-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-])
++dnl AC_BROKEN2(func, includes, arguments)
++AC_DEFUN([AC_BROKEN2],
++[AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(ac_cv_func_[]$1,
++[AC_TRY_LINK([$2],
++[
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$1) || defined (__stub___$1)
++choke me
++#else
++$1($3)
++#endif
++], [eval "ac_cv_func_[]$1=yes"], [eval "ac_cv_func_[]$1=no"])])
++if eval "test \"\${ac_cv_func_[]$1}\" = yes"; then
++  AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, define)
++  AC_MSG_RESULT(yes)
++else
++  AC_MSG_RESULT(no)
++  rk_LIBOBJ($1)
++fi])
++
++dnl $Id: have-struct-field.m4,v 1.6.22.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl check for fields in a structure
++dnl
++dnl AC_HAVE_STRUCT_FIELD(struct, field, headers)
++
++AC_DEFUN([AC_HAVE_STRUCT_FIELD], [
++define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_]))
++AC_CACHE_CHECK([for $2 in $1], cache_val,[
++AC_TRY_COMPILE([$3],[$1 x; x.$2;],
++cache_val=yes,
++cache_val=no)])
++if test "$cache_val" = yes; then
++	define(foo, translit(HAVE_$1_$2, [a-z ], [A-Z_]))
++	AC_DEFINE(foo, 1, [Define if $1 has field $2.])
++	undefine([foo])
++fi
++undefine([cache_val])
+ ])
+ 
++dnl $Id: broken-getnameinfo.m4,v 1.2.12.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl test for broken AIX getnameinfo
+ 
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated.  The stamp files are numbered to have different names.
++AC_DEFUN([rk_BROKEN_GETNAMEINFO],[
++AC_CACHE_CHECK([if getnameinfo is broken], ac_cv_func_getnameinfo_broken,
++AC_TRY_RUN([[#include <stdio.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <netdb.h>
+ 
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+-  case $_am_header in
+-    $1 | $1:* )
+-      break ;;
+-    * )
+-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+-  esac
+-done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++int
++main(int argc, char **argv)
++{
++  struct sockaddr_in sin;
++  char host[256];
++  memset(&sin, 0, sizeof(sin));
++#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
++  sin.sin_len = sizeof(sin);
++#endif
++  sin.sin_family = AF_INET;
++  sin.sin_addr.s_addr = 0xffffffff;
++  sin.sin_port = 0;
++  return getnameinfo((struct sockaddr*)&sin, sizeof(sin), host, sizeof(host),
++	      NULL, 0, 0);
++}
++]], ac_cv_func_getnameinfo_broken=no, ac_cv_func_getnameinfo_broken=yes))])
+ 
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
++dnl $Id: broken-getaddrinfo.m4,v 1.3.6.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl test if getaddrinfo can handle numeric services
+ 
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++AC_DEFUN([rk_BROKEN_GETADDRINFO],[
++AC_CACHE_CHECK([if getaddrinfo handles numeric services], ac_cv_func_getaddrinfo_numserv,
++AC_TRY_RUN([[#include <stdio.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netdb.h>
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++int
++main(int argc, char **argv)
++{
++	struct addrinfo hints, *ai;
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_flags = AI_PASSIVE;
++	hints.ai_socktype = SOCK_STREAM;
++	hints.ai_family = PF_UNSPEC;
++	if(getaddrinfo(NULL, "17", &hints, &ai) != 0)
++		return 1;
++	return 0;
++}
++]], ac_cv_func_getaddrinfo_numserv=yes, ac_cv_func_getaddrinfo_numserv=no))])
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++dnl
++dnl $Id: broken-realloc.m4,v 1.1.12.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl Test for realloc that doesn't handle NULL as first parameter
++dnl
++AC_DEFUN([rk_BROKEN_REALLOC], [
++AC_CACHE_CHECK(if realloc if broken, ac_cv_func_realloc_broken, [
++ac_cv_func_realloc_broken=no
++AC_TRY_RUN([
++#include <stddef.h>
++#include <stdlib.h>
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++int main()
++{
++	return realloc(NULL, 17) == NULL;
++}
++],:, ac_cv_func_realloc_broken=yes, :)
++])
++if test "$ac_cv_func_realloc_broken" = yes ; then
++	AC_DEFINE(BROKEN_REALLOC, 1, [Define if realloc(NULL) doesn't work.])
++fi
++AH_BOTTOM([#ifdef BROKEN_REALLOC
++#define realloc(X, Y) isoc_realloc((X), (Y))
++#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y))
++#endif])
++])
+ 
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
++dnl $Id: proto-compat.m4,v 1.3.34.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl
++dnl Check if the prototype of a function is compatible with another one
++dnl
+ 
+-#                                                          -*- Autoconf -*-
+-# Copyright (C) 2003  Free Software Foundation, Inc.
++dnl AC_PROTO_COMPAT(includes, function, prototype)
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++AC_DEFUN([AC_PROTO_COMPAT], [
++AC_CACHE_CHECK([if $2 is compatible with system prototype],
++ac_cv_func_$2_proto_compat,
++AC_TRY_COMPILE([$1],
++[$3;],
++eval "ac_cv_func_$2_proto_compat=yes",
++eval "ac_cv_func_$2_proto_compat=no"))
++define([foo], translit($2, [a-z], [A-Z])[_PROTO_COMPATIBLE])
++if test "$ac_cv_func_$2_proto_compat" = yes; then
++	AC_DEFINE(foo, 1, [define if prototype of $2 is compatible with
++	$3])
++fi
++undefine([foo])
++])
++dnl $Id: krb-struct-winsize.m4,v 1.3.10.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl
++dnl Search for struct winsize
++dnl
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++AC_DEFUN([AC_KRB_STRUCT_WINSIZE], [
++AC_MSG_CHECKING(for struct winsize)
++AC_CACHE_VAL(ac_cv_struct_winsize, [
++ac_cv_struct_winsize=no
++for i in sys/termios.h sys/ioctl.h; do
++AC_EGREP_HEADER(
++struct[[ 	]]*winsize,dnl
++$i, ac_cv_struct_winsize=yes; break)dnl
++done
++])
++if test "$ac_cv_struct_winsize" = "yes"; then
++  AC_DEFINE(HAVE_STRUCT_WINSIZE, 1, [define if struct winsize is declared in sys/termios.h])
++fi
++AC_MSG_RESULT($ac_cv_struct_winsize)
++AC_EGREP_HEADER(ws_xpixel, termios.h, 
++	AC_DEFINE(HAVE_WS_XPIXEL, 1, [define if struct winsize has ws_xpixel]))
++AC_EGREP_HEADER(ws_ypixel, termios.h, 
++	AC_DEFINE(HAVE_WS_YPIXEL, 1, [define if struct winsize has ws_ypixel]))
++])
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++dnl $Id: krb-struct-spwd.m4,v 1.3.32.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl Test for `struct spwd'
+ 
+-# serial 1
++AC_DEFUN([AC_KRB_STRUCT_SPWD], [
++AC_MSG_CHECKING(for struct spwd)
++AC_CACHE_VAL(ac_cv_struct_spwd, [
++AC_TRY_COMPILE(
++[#include <pwd.h>
++#ifdef HAVE_SHADOW_H
++#include <shadow.h>
++#endif],
++[struct spwd foo;],
++ac_cv_struct_spwd=yes,
++ac_cv_struct_spwd=no)
++])
++AC_MSG_RESULT($ac_cv_struct_spwd)
+ 
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot.  For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+-  am__leading_dot=.
+-else
+-  am__leading_dot=_
++if test "$ac_cv_struct_spwd" = "yes"; then
++  AC_DEFINE(HAVE_STRUCT_SPWD, 1, [define if you have struct spwd])
+ fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
++])
++
++dnl $Id: otp.m4,v 1.2 2002/05/19 20:51:08 joda Exp $
++dnl
++dnl check requirements for OTP library
++dnl
++AC_DEFUN([rk_OTP],[
++AC_REQUIRE([rk_DB])dnl
++AC_ARG_ENABLE(otp,
++	AC_HELP_STRING([--disable-otp],[if you don't want OTP support]))
++if test "$enable_otp" = yes -a "$db_type" = unknown; then
++	AC_MSG_ERROR([OTP requires a NDBM/DB compatible library])
++fi
++if test "$enable_otp" != no; then
++	if test "$db_type" != unknown; then
++		enable_otp=yes
++	else
++		enable_otp=no
++	fi
++fi
++if test "$enable_otp" = yes; then
++	AC_DEFINE(OTP, 1, [Define if you want OTP support in applications.])
++fi
++AC_MSG_CHECKING([whether to enable OTP library])
++AC_MSG_RESULT($enable_otp)
++AM_CONDITIONAL(OTP, test "$enable_otp" = yes)dnl
++])
+ 
++dnl $Id: osfc2.m4,v 1.3.8.1 2004/04/01 07:27:35 joda Exp $
++dnl
++dnl enable OSF C2 stuff
+ 
+-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+-# Free Software Foundation, Inc.
++AC_DEFUN([AC_CHECK_OSFC2],[
++AC_ARG_ENABLE(osfc2,
++	AC_HELP_STRING([--enable-osfc2],[enable some OSF C2 support]))
++LIB_security=
++if test "$enable_osfc2" = yes; then
++	AC_DEFINE(HAVE_OSFC2, 1, [Define to enable basic OSF C2 support.])
++	LIB_security=-lsecurity
++fi
++AC_SUBST(LIB_security)
++])
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl $Id: check-man.m4,v 1.3.12.1 2004/04/01 07:27:32 joda Exp $
++dnl check how to format manual pages
++dnl
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++AC_DEFUN([rk_CHECK_MAN],
++[AC_PATH_PROG(NROFF, nroff)
++AC_PATH_PROG(GROFF, groff)
++AC_CACHE_CHECK(how to format man pages,ac_cv_sys_man_format,
++[cat > conftest.1 << END
++.Dd January 1, 1970
++.Dt CONFTEST 1
++.Sh NAME
++.Nm conftest
++.Nd
++foobar
++END
++
++if test "$NROFF" ; then
++	for i in "-mdoc" "-mandoc"; do
++		if "$NROFF" $i conftest.1 2> /dev/null | \
++			grep Jan > /dev/null 2>&1 ; then
++			ac_cv_sys_man_format="$NROFF $i"
++			break
++		fi
++	done
++fi
++if test "$ac_cv_sys_man_format" = "" -a "$GROFF" ; then
++	for i in "-mdoc" "-mandoc"; do
++		if "$GROFF" -Tascii $i conftest.1 2> /dev/null | \
++			grep Jan > /dev/null 2>&1 ; then
++			ac_cv_sys_man_format="$GROFF -Tascii $i"
++			break
++		fi
++	done
++fi
++if test "$ac_cv_sys_man_format"; then
++	ac_cv_sys_man_format="$ac_cv_sys_man_format \[$]< > \[$]@"
++fi
++])
++if test "$ac_cv_sys_man_format"; then
++	CATMAN="$ac_cv_sys_man_format"
++	AC_SUBST(CATMAN)
++fi
++AM_CONDITIONAL(CATMAN, test "$CATMAN")
++AC_CACHE_CHECK(extension of pre-formatted manual pages,ac_cv_sys_catman_ext,
++[if grep _suffix /etc/man.conf > /dev/null 2>&1; then
++	ac_cv_sys_catman_ext=0
++else
++	ac_cv_sys_catman_ext=number
++fi
++])
++if test "$ac_cv_sys_catman_ext" = number; then
++	CATMANEXT='$$section'
++else
++	CATMANEXT=0
++fi
++AC_SUBST(CATMANEXT)
++])
++dnl
++dnl $Id: krb-bigendian.m4,v 1.8.6.1 2004/04/01 07:27:33 joda Exp $
++dnl
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++dnl check if this computer is little or big-endian
++dnl if we can figure it out at compile-time then don't define the cpp symbol
++dnl otherwise test for it and define it.  also allow options for overriding
++dnl it when cross-compiling
++
++AC_DEFUN([KRB_C_BIGENDIAN], [
++AC_ARG_ENABLE(bigendian,
++	AC_HELP_STRING([--enable-bigendian],[the target is big endian]),
++krb_cv_c_bigendian=yes)
++AC_ARG_ENABLE(littleendian,
++	AC_HELP_STRING([--enable-littleendian],[the target is little endian]),
++krb_cv_c_bigendian=no)
++AC_CACHE_CHECK(whether byte order is known at compile time,
++krb_cv_c_bigendian_compile,
++[AC_TRY_COMPILE([
++#include <sys/types.h>
++#include <sys/param.h>],[
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif], krb_cv_c_bigendian_compile=yes, krb_cv_c_bigendian_compile=no)])
++AC_CACHE_CHECK(whether byte ordering is bigendian, krb_cv_c_bigendian,[
++  if test "$krb_cv_c_bigendian_compile" = "yes"; then
++    AC_TRY_COMPILE([
++#include <sys/types.h>
++#include <sys/param.h>],[
++#if BYTE_ORDER != BIG_ENDIAN
++  not big endian
++#endif], krb_cv_c_bigendian=yes, krb_cv_c_bigendian=no)
++  else
++    AC_TRY_RUN([main () {
++      /* Are we little or big endian?  From Harbison&Steele.  */
++      union
++      {
++	long l;
++	char c[sizeof (long)];
++    } u;
++    u.l = 1;
++    exit (u.c[sizeof (long) - 1] == 1);
++  }], krb_cv_c_bigendian=no, krb_cv_c_bigendian=yes,
++  AC_MSG_ERROR([specify either --enable-bigendian or --enable-littleendian]))
++  fi
++])
++if test "$krb_cv_c_bigendian" = "yes"; then
++  AC_DEFINE(WORDS_BIGENDIAN, 1, [define if target is big endian])dnl
++fi
++if test "$krb_cv_c_bigendian_compile" = "yes"; then
++  AC_DEFINE(ENDIANESS_IN_SYS_PARAM_H, 1, [define if sys/param.h defines the endiness])dnl
++fi
++AH_BOTTOM([
++#if ENDIANESS_IN_SYS_PARAM_H
++#  include <sys/types.h>
++#  include <sys/param.h>
++#  if BYTE_ORDER == BIG_ENDIAN
++#  define WORDS_BIGENDIAN 1
++#  endif
++#endif
++])
++])
+ 
+-# serial 4
++dnl
++dnl $Id: aix.m4,v 1.9.6.1 2004/04/01 07:27:32 joda Exp $
++dnl
+ 
+-# AM_PROG_LEX
+-# -----------
+-# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
+-# "missing" invocation, for better error output.
+-AC_DEFUN([AM_PROG_LEX],
+-[AC_PREREQ(2.50)dnl
+-AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+-AC_REQUIRE([AC_PROG_LEX])dnl
+-if test "$LEX" = :; then
+-  LEX=${am_missing_run}flex
+-fi])
++AC_DEFUN([rk_AIX],[
+ 
+-# Add --enable-maintainer-mode option to configure.
+-# From Jim Meyering
++aix=no
++case "$host" in 
++*-*-aix3*)
++	aix=3
++	;;
++*-*-aix4*|*-*-aix5*)
++	aix=4
++	;;
++esac
+ 
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++AM_CONDITIONAL(AIX, test "$aix" != no)dnl
++AM_CONDITIONAL(AIX4, test "$aix" = 4)
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++AC_ARG_ENABLE(dynamic-afs,
++	AC_HELP_STRING([--disable-dynamic-afs],
++		[do not use loaded AFS library with AIX]))
++
++if test "$aix" != no; then
++	if test "$enable_dynamic_afs" != no; then
++		AC_REQUIRE([rk_DLOPEN])
++		if test "$ac_cv_func_dlopen" = no; then
++			AC_FIND_FUNC_NO_LIBS(loadquery, ld)
++		fi
++		if test "$ac_cv_func_dlopen" != no; then
++			AIX_EXTRA_KAFS='$(LIB_dlopen)'
++		elif test "$ac_cv_func_loadquery" != no; then
++			AIX_EXTRA_KAFS='$(LIB_loadquery)'
++		else
++			AC_MSG_NOTICE([not using dynloaded AFS library])
++			AIX_EXTRA_KAFS=
++			enable_dynamic_afs=no
++		fi
++	else
++		AIX_EXTRA_KAFS=
++	fi
++fi
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++AM_CONDITIONAL(AIX_DYNAMIC_AFS, test "$enable_dynamic_afs" != no)dnl
++AC_SUBST(AIX_EXTRA_KAFS)dnl
+ 
+-# serial 3
++AH_BOTTOM([#if _AIX
++#define _ALL_SOURCE
++/* XXX this is gross, but kills about a gazillion warnings */
++struct ether_addr;
++struct sockaddr;
++struct sockaddr_dl;
++struct sockaddr_in;
++#endif])
+ 
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+-  dnl maintainer-mode is disabled by default
+-  AC_ARG_ENABLE(maintainer-mode,
+-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+-			  (and sometimes confusing) to the casual installer],
+-      USE_MAINTAINER_MODE=$enableval,
+-      USE_MAINTAINER_MODE=no)
+-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+-  MAINT=$MAINTAINER_MODE_TRUE
+-  AC_SUBST(MAINT)dnl
+-]
+-)
++])
+ 
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++dnl
++dnl $Id: dlopen.m4,v 1.1 2002/08/28 16:32:16 joda Exp $
++dnl
+ 
+-#  -*- Autoconf -*-
++AC_DEFUN([rk_DLOPEN], [
++	AC_FIND_FUNC_NO_LIBS(dlopen, dl)
++	AM_CONDITIONAL(HAVE_DLOPEN, test "$ac_cv_funclib_dlopen" != no)
++])
+ 
++dnl
++dnl $Id: irix.m4,v 1.1 2002/08/28 19:11:44 joda Exp $
++dnl
+ 
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
++AC_DEFUN([rk_IRIX],
++[
++irix=no
++case "$host" in
++*-*-irix4*) 
++	AC_DEFINE([IRIX4], 1,
++		[Define if you are running IRIX 4.])
++	irix=yes
++	;;
++*-*-irix*) 
++	irix=yes
++	;;
++esac
++AM_CONDITIONAL(IRIX, test "$irix" != no)dnl
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++AH_BOTTOM([
++/* IRIX 4 braindamage */
++#if IRIX == 4 && !defined(__STDC__)
++#define __STDC__ 0
++#endif
++])
++])
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++dnl
++dnl $Id: sunos.m4,v 1.2 2002/10/16 14:42:13 joda Exp $
++dnl
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++AC_DEFUN([rk_SUNOS],[
++sunos=no
++case "$host" in 
++*-*-sunos4*)
++	sunos=40
++	;;
++*-*-solaris2.7)
++	sunos=57
++	;;
++*-*-solaris2.[[89]])
++	sunos=58
++	;;
++*-*-solaris2*)
++	sunos=50
++	;;
++esac
++if test "$sunos" != no; then
++	AC_DEFINE_UNQUOTED(SunOS, $sunos, 
++		[Define to what version of SunOS you are running.])
++fi
++])
++dnl 
++dnl See if there is any X11 present
++dnl
++dnl $Id: check-x.m4,v 1.2.20.1 2004/04/01 07:27:33 joda Exp $
+ 
+-# serial 3
++AC_DEFUN([KRB_CHECK_X],[
++AC_PATH_XTRA
+ 
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++# try to figure out if we need any additional ld flags, like -R
++# and yes, the autoconf X test is utterly broken
++if test "$no_x" != yes; then
++	AC_CACHE_CHECK(for special X linker flags,krb_cv_sys_x_libs_rpath,[
++	ac_save_libs="$LIBS"
++	ac_save_cflags="$CFLAGS"
++	CFLAGS="$CFLAGS $X_CFLAGS"
++	krb_cv_sys_x_libs_rpath=""
++	krb_cv_sys_x_libs=""
++	for rflag in "" "-R" "-R " "-rpath "; do
++		if test "$rflag" = ""; then
++			foo="$X_LIBS"
++		else
++			foo=""
++			for flag in $X_LIBS; do
++			case $flag in
++			-L*)
++				foo="$foo $flag `echo $flag | sed \"s/-L/$rflag/\"`"
++				;;
++			*)
++				foo="$foo $flag"
++				;;
++			esac
++			done
++		fi
++		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++		AC_TRY_RUN([
++		#include <X11/Xlib.h>
++		foo()
++		{
++		XOpenDisplay(NULL);
++		}
++		main()
++		{
++		return 0;
++		}
++		], krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break,:)
++	done
++	LIBS="$ac_save_libs"
++	CFLAGS="$ac_save_cflags"
++	])
++	X_LIBS="$krb_cv_sys_x_libs"
++fi
++])
+ 
++dnl $Id: check-xau.m4,v 1.3.34.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl check for Xau{Read,Write}Auth and XauFileName
++dnl
++AC_DEFUN([AC_CHECK_XAU],[
++save_CFLAGS="$CFLAGS"
++CFLAGS="$X_CFLAGS $CFLAGS"
++save_LIBS="$LIBS"
++dnl LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
++LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
++save_LDFLAGS="$LDFLAGS"
++LDFLAGS="$LDFLAGS $X_LIBS"
++
++
++AC_FIND_FUNC_NO_LIBS(XauWriteAuth, X11 Xau)
++ac_xxx="$LIBS"
++LIBS="$LIB_XauWriteAuth $LIBS"
++AC_FIND_FUNC_NO_LIBS(XauReadAuth, X11 Xau)
++LIBS="$LIB_XauReadAauth $LIBS"
++AC_FIND_FUNC_NO_LIBS(XauFileName, X11 Xau)
++LIBS="$ac_xxx"
++
++case "$ac_cv_funclib_XauWriteAuth" in
++yes)	;;
++no)	;;
++*)	if test "$ac_cv_funclib_XauReadAuth" = yes; then
++		if test "$ac_cv_funclib_XauFileName" = yes; then
++			LIB_XauReadAuth="$LIB_XauWriteAuth"
++		else
++			LIB_XauReadAuth="$LIB_XauWriteAuth $LIB_XauFileName"
++		fi
++	else
++		if test "$ac_cv_funclib_XauFileName" = yes; then
++			LIB_XauReadAuth="$LIB_XauReadAuth $LIB_XauWriteAuth"
++		else
++			LIB_XauReadAuth="$LIB_XauReadAuth $LIB_XauWriteAuth $LIB_XauFileName"
++		fi
++	fi
++	;;
++esac
+ 
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+-  am_missing_run="$MISSING --run "
++if test "$AUTOMAKE" != ""; then
++	AM_CONDITIONAL(NEED_WRITEAUTH, test "$ac_cv_func_XauWriteAuth" != "yes")
+ else
+-  am_missing_run=
+-  AC_MSG_WARN([`missing' script is too old or missing])
++	AC_SUBST(NEED_WRITEAUTH_TRUE)
++	AC_SUBST(NEED_WRITEAUTH_FALSE)
++	if test "$ac_cv_func_XauWriteAuth" != "yes"; then
++		NEED_WRITEAUTH_TRUE=
++		NEED_WRITEAUTH_FALSE='#'
++	else
++		NEED_WRITEAUTH_TRUE='#'
++		NEED_WRITEAUTH_FALSE=
++	fi
+ fi
++CFLAGS=$save_CFLAGS
++LIBS=$save_LIBS
++LDFLAGS=$save_LDFLAGS
+ ])
+ 
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
++dnl $Id: check-type-extra.m4,v 1.2.34.1 2004/04/01 07:27:33 joda Exp $
++dnl
++dnl ac_check_type + extra headers
+ 
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++dnl AC_CHECK_TYPE_EXTRA(TYPE, DEFAULT, HEADERS)
++AC_DEFUN([AC_CHECK_TYPE_EXTRA],
++[AC_REQUIRE([AC_HEADER_STDC])dnl
++AC_MSG_CHECKING(for $1)
++AC_CACHE_VAL(ac_cv_type_$1,
++[AC_EGREP_CPP(dnl
++changequote(<<,>>)dnl
++<<$1[^a-zA-Z_0-9]>>dnl
++changequote([,]), [#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++$3], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
++AC_MSG_RESULT($ac_cv_type_$1)
++if test $ac_cv_type_$1 = no; then
++  AC_DEFINE($1, $2, [Define this to what the type $1 should be.])
++fi
++])
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl
++dnl $Id: capabilities.m4,v 1.2.20.1 2004/04/01 07:27:32 joda Exp $
++dnl
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++dnl
++dnl Test SGI capabilities
++dnl
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++AC_DEFUN([KRB_CAPABILITIES],[
+ 
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake.  There are at least two reasons why we must not
+-# use `-m 0755':
+-#   - it causes special bits like SGID to be ignored,
+-#   - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out.  Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # Keeping the `.' argument allows $(mkdir_p) to be used without
+-  # argument.  Indeed, we sometimes output rules like
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.
+-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+-  # expensive solution, as it forces Make to start a sub-shell.)
+-  mkdir_p='mkdir -p -- .'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
+-  else
+-    mkdir_p='$(install_sh) -d'
+-  fi
+-fi
+-AC_SUBST([mkdir_p])])
++AC_CHECK_HEADERS(capability.h sys/capability.h)
+ 
+-# Helper functions for option handling.                    -*- Autoconf -*-
++AC_CHECK_FUNCS(sgi_getcapabilitybyname cap_set_proc)
++])
+ 
+-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
++dnl $Id: check-getpwnam_r-posix.m4,v 1.2.34.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl check for getpwnam_r, and if it's posix or not
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++AC_DEFUN([AC_CHECK_GETPWNAM_R_POSIX],[
++AC_FIND_FUNC_NO_LIBS(getpwnam_r,c_r)
++if test "$ac_cv_func_getpwnam_r" = yes; then
++	AC_CACHE_CHECK(if getpwnam_r is posix,ac_cv_func_getpwnam_r_posix,
++	ac_libs="$LIBS"
++	LIBS="$LIBS $LIB_getpwnam_r"
++	AC_TRY_RUN([
++#include <pwd.h>
++int main()
++{
++	struct passwd pw, *pwd;
++	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
++}
++],ac_cv_func_getpwnam_r_posix=yes,ac_cv_func_getpwnam_r_posix=no,:)
++LIBS="$ac_libs")
++if test "$ac_cv_func_getpwnam_r_posix" = yes; then
++	AC_DEFINE(POSIX_GETPWNAM_R, 1, [Define if getpwnam_r has POSIX flavour.])
++fi
++fi
++])
++dnl $Id: krb-readline.m4,v 1.5.6.1 2004/04/01 07:27:34 joda Exp $
++dnl
++dnl Tests for readline functions
++dnl
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++dnl el_init
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++AC_DEFUN([KRB_READLINE],[
++AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent])
++if test "$ac_cv_func_el_init" = yes ; then
++	AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[
++		AC_TRY_COMPILE([#include <stdio.h>
++			#include <histedit.h>],
++			[el_init("", NULL, NULL, NULL);],
++			ac_cv_func_el_init_four=yes,
++			ac_cv_func_el_init_four=no)])
++	if test "$ac_cv_func_el_init_four" = yes; then
++		AC_DEFINE(HAVE_FOUR_VALUED_EL_INIT, 1, [Define if el_init takes four arguments.])
++	fi
++fi
+ 
+-# serial 2
++dnl readline
+ 
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++ac_foo=no
++if test "$with_readline" = yes; then
++	:
++elif test "$ac_cv_func_readline" = yes; then
++	:
++elif test "$ac_cv_func_el_init" = yes; then
++	ac_foo=yes
++	DIR_readline="editline"
++	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)"
++else
++	DIR_readline="editline"
++	LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)"
++fi
++AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
++AC_DEFINE(HAVE_READLINE, 1, 
++	[Define if you have a readline compatible library.])dnl
+ 
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME.  Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++])
+ 
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++dnl
++dnl $Id: telnet.m4,v 1.1 2002/08/28 19:19:01 joda Exp $
++dnl
++dnl stuff used by telnet
+ 
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++AC_DEFUN([rk_TELNET],[
++AC_DEFINE(AUTHENTICATION, 1, 
++	[Define if you want authentication support in telnet.])dnl
++AC_DEFINE(ENCRYPTION, 1,
++	[Define if you want encryption support in telnet.])dnl
++AC_DEFINE(DES_ENCRYPTION, 1,
++	[Define if you want to use DES encryption in telnet.])dnl
++AC_DEFINE(DIAGNOSTICS, 1,
++	[Define this to enable diagnostics in telnet.])dnl
++AC_DEFINE(OLD_ENVIRON, 1,
++	[Define this to enable old environment option in telnet.])dnl
++if false; then
++	AC_DEFINE(ENV_HACK, 1,
++		[Define this if you want support for broken ENV_{VAR,VAL} telnets.])
++fi
+ 
++# Simple test for streamspty, based on the existance of getmsg(), alas
++# this breaks on SunOS4 which have streams but BSD-like ptys
+ #
+-# Check to make sure that the build environment is sane.
+-#
++# And also something wierd has happend with dec-osf1, fallback to bsd-ptys
+ 
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++case "$host" in
++*-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[[01]]*)
++	;;
++*)
++	AC_CHECK_FUNC(getmsg)
++	if test "$ac_cv_func_getmsg" = "yes"; then
++		AC_CACHE_CHECK([if getmsg works], ac_cv_func_getmsg_works,
++		AC_TRY_RUN([
++			#include <stdio.h>
++			#include <errno.h>
++
++			int main()
++			{
++			  int ret;
++			  ret = getmsg(open("/dev/null", 0), NULL, NULL, NULL);
++			  if(ret < 0 && errno == ENOSYS)
++			    return 1;
++			  return 0;
++			}
++			], ac_cv_func_getmsg_works=yes, 
++			ac_cv_func_getmsg_works=no,
++			ac_cv_func_getmsg_works=no))
++		if test "$ac_cv_func_getmsg_works" = "yes"; then
++			AC_DEFINE(HAVE_GETMSG, 1,
++				[Define if you have a working getmsg.])
++			AC_DEFINE(STREAMSPTY, 1,
++				[Define if you have streams ptys.])
++		fi
++	fi
++	;;
++esac
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++AH_BOTTOM([
++#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
++#define AUTHENTICATION 1
++#endif
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++/* Set this to the default system lead string for telnetd 
++ * can contain %-escapes: %s=sysname, %m=machine, %r=os-release
++ * %v=os-version, %t=tty, %h=hostname, %d=date and time
++ */
++#undef USE_IM
++
++/* Used with login -p */
++#undef LOGIN_ARGS
++
++/* set this to a sensible login */
++#ifndef LOGIN_PATH
++#define LOGIN_PATH BINDIR "/login"
++#endif
++])
++])
+ 
+-# serial 3
++dnl $Id: check-compile-et.m4,v 1.7.2.1 2003/08/15 14:40:42 lha Exp $
++dnl
++dnl CHECK_COMPILE_ET
++AC_DEFUN([CHECK_COMPILE_ET], [
+ 
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments.  Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+-   if test "$[*]" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t $srcdir/configure conftest.file`
+-   fi
+-   rm -f conftest.file
+-   if test "$[*]" != "X $srcdir/configure conftest.file" \
+-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et])
+ 
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # if, for instance, CONFIG_SHELL is bash and it inherits a
+-      # broken ls alias from the environment.  This has actually
+-      # happened.  Such a system could not be considered "sane".
+-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment])
+-   fi
++krb_cv_compile_et="no"
++krb_cv_com_err_need_r=""
++if test "${COMPILE_ET}" = "compile_et"; then
++
++dnl We have compile_et.  Now let's see if it supports `prefix' and `index'.
++AC_MSG_CHECKING(whether compile_et has the features we need)
++cat > conftest_et.et <<'EOF'
++error_table test conf
++prefix CONFTEST
++index 1
++error_code CODE1, "CODE1"
++index 128
++error_code CODE2, "CODE2"
++end
++EOF
++if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
++  dnl XXX Some systems have <et/com_err.h>.
++  save_CPPFLAGS="${CPPFLAGS}"
++  if test -d "/usr/include/et"; then
++    CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
++  fi
++  dnl Check that the `prefix' and `index' directives were honored.
++  AC_TRY_RUN([
++#include <com_err.h>
++#include <string.h>
++#include "conftest_et.h"
++int main(){
++#ifndef ERROR_TABLE_BASE_conf
++#error compile_et does not handle error_table N M
++#endif
++return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
++  ], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
++fi
++AC_MSG_RESULT(${krb_cv_compile_et})
++if test "${krb_cv_compile_et}" = "yes"; then
++  AC_MSG_CHECKING(for if com_err needs to have a initialize_error_table_r)
++  AC_EGREP_CPP(initialize_error_table_r,[#include "conftest_et.c"],
++     [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"])
++  if test X"$krb_cv_com_err_need_r" = X ; then
++    AC_MSG_RESULT(no)
++  else
++    AC_MSG_RESULT(yes)
++  fi
++fi
++rm -fr conftest*
++fi
+ 
+-   test "$[2]" = conftest.file
+-   )
+-then
+-   # Ok.
+-   :
++if test "${krb_cv_compile_et}" = "yes"; then
++  dnl Since compile_et seems to work, let's check libcom_err
++  krb_cv_save_LIBS="${LIBS}"
++  LIBS="${LIBS} -lcom_err"
++  AC_MSG_CHECKING(for com_err)
++  AC_TRY_LINK([#include <com_err.h>],[
++    const char *p;
++    p = error_message(0);
++    $krb_cv_com_err_need_r
++  ],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
++  AC_MSG_RESULT(${krb_cv_com_err})
++  LIBS="${krb_cv_save_LIBS}"
+ else
+-   AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
++  dnl Since compile_et doesn't work, forget about libcom_err
++  krb_cv_com_err="no"
+ fi
+-AC_MSG_RESULT(yes)])
+ 
+-# AM_PROG_INSTALL_STRIP
++dnl Only use the system's com_err if we found compile_et, libcom_err, and
++dnl com_err.h.
++if test "${krb_cv_com_err}" = "yes"; then
++    DIR_com_err=""
++    LIB_com_err="-lcom_err"
++    LIB_com_err_a=""
++    LIB_com_err_so=""
++    AC_MSG_NOTICE(Using the already-installed com_err)
++else
++    COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et"
++    DIR_com_err="com_err"
++    LIB_com_err="\$(top_builddir)/lib/com_err/libcom_err.la"
++    LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a"
++    LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so"
++    AC_MSG_NOTICE(Using our own com_err)
++fi
++AC_SUBST(DIR_com_err)
++AC_SUBST(LIB_com_err)
++AC_SUBST(LIB_com_err_a)
++AC_SUBST(LIB_com_err_so)
+ 
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
++])
+ 
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2, or (at your option)
+-# any later version.
++dnl $Id: auth-modules.m4,v 1.5.6.1 2004/04/01 07:27:32 joda Exp $
++dnl
++dnl Figure what authentication modules should be built
++dnl
++dnl rk_AUTH_MODULES(module-list)
+ 
+-# This program is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
++AC_DEFUN([rk_AUTH_MODULES],[
++AC_MSG_CHECKING([which authentication modules should be built])
+ 
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++z='m4_ifval([$1], $1, [sia pam afskauthlib])'
++LIB_AUTH_SUBDIRS=
++for i in $z; do
++case $i in
++sia)
++if test "$ac_cv_header_siad_h" = yes; then
++	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS sia"
++fi
++;;
++pam)
++case "${host}" in
++*-*-freebsd*)	ac_cv_want_pam_krb4=no ;;
++*)		ac_cv_want_pam_krb4=yes ;;
++esac
+ 
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries.  This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'.  However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+-  AC_CHECK_TOOL([STRIP], [strip], :)
++if test "$ac_cv_want_pam_krb4" = yes -a \
++    "$ac_cv_header_security_pam_modules_h" = yes -a \
++    "$enable_shared" = yes; then
++	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS pam"
++fi
++;;
++afskauthlib)
++case "${host}" in
++*-*-irix[[56]]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
++esac
++;;
++esac
++done
++if test "$LIB_AUTH_SUBDIRS"; then
++	AC_MSG_RESULT($LIB_AUTH_SUBDIRS)
++else
++	AC_MSG_RESULT(none)
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
+-m4_include([cf/aix.m4])
+-m4_include([cf/auth-modules.m4])
+-m4_include([cf/broken-getaddrinfo.m4])
+-m4_include([cf/broken-getnameinfo.m4])
+-m4_include([cf/broken-glob.m4])
+-m4_include([cf/broken-realloc.m4])
+-m4_include([cf/broken-snprintf.m4])
+-m4_include([cf/broken.m4])
+-m4_include([cf/broken2.m4])
+-m4_include([cf/c-attribute.m4])
+-m4_include([cf/capabilities.m4])
+-m4_include([cf/check-compile-et.m4])
+-m4_include([cf/check-declaration.m4])
+-m4_include([cf/check-getpwnam_r-posix.m4])
+-m4_include([cf/check-man.m4])
+-m4_include([cf/check-netinet-ip-and-tcp.m4])
+-m4_include([cf/check-type-extra.m4])
+-m4_include([cf/check-var.m4])
+-m4_include([cf/check-x.m4])
+-m4_include([cf/check-xau.m4])
+-m4_include([cf/crypto.m4])
+-m4_include([cf/db.m4])
+-m4_include([cf/destdirs.m4])
+-m4_include([cf/dlopen.m4])
+-m4_include([cf/find-func-no-libs.m4])
+-m4_include([cf/find-func-no-libs2.m4])
+-m4_include([cf/find-func.m4])
+-m4_include([cf/find-if-not-broken.m4])
+-m4_include([cf/have-struct-field.m4])
+-m4_include([cf/have-type.m4])
+-m4_include([cf/irix.m4])
+-m4_include([cf/krb-bigendian.m4])
+-m4_include([cf/krb-func-getlogin.m4])
+-m4_include([cf/krb-ipv6.m4])
+-m4_include([cf/krb-prog-ln-s.m4])
+-m4_include([cf/krb-readline.m4])
+-m4_include([cf/krb-struct-spwd.m4])
+-m4_include([cf/krb-struct-winsize.m4])
+-m4_include([cf/mips-abi.m4])
+-m4_include([cf/misc.m4])
+-m4_include([cf/need-proto.m4])
+-m4_include([cf/osfc2.m4])
+-m4_include([cf/otp.m4])
+-m4_include([cf/proto-compat.m4])
+-m4_include([cf/retsigtype.m4])
+-m4_include([cf/roken-frag.m4])
+-m4_include([cf/sunos.m4])
+-m4_include([cf/telnet.m4])
+-m4_include([cf/test-package.m4])
+-m4_include([cf/wflags.m4])
+-m4_include([cf/with-all.m4])
++AC_SUBST(LIB_AUTH_SUBDIRS)dnl
++])
++
++dnl
++dnl $Id: destdirs.m4,v 1.2 2002/08/12 15:12:50 joda Exp $
++dnl
++
++AC_DEFUN([rk_DESTDIRS], [
++# This is done by AC_OUTPUT but we need the result here.
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++AC_FOREACH([rk_dir], [bin lib libexec localstate sbin sysconf], [
++	x="${rk_dir[]dir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	AC_DEFINE_UNQUOTED(AS_TR_CPP(rk_dir[]dir), "$x", [path to ]rk_dir[])])
++])
++
+diff -ruN heimdal-0.6.3-old/admin/Makefile.in heimdal-0.6.3/admin/Makefile.in
+--- heimdal-0.6.3-old/admin/Makefile.in	2004-09-13 22:28:50.000000000 +1000
++++ heimdal-0.6.3/admin/Makefile.in	2004-09-14 08:39:41.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(ktutil_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,87 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-sbin_PROGRAMS = ktutil$(EXEEXT)
+-subdir = admin
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(sbin_PROGRAMS)
+-am_ktutil_OBJECTS = add.$(OBJEXT) change.$(OBJEXT) copy.$(OBJEXT) \
+-	get.$(OBJEXT) ktutil.$(OBJEXT) list.$(OBJEXT) purge.$(OBJEXT) \
+-	remove.$(OBJEXT) rename.$(OBJEXT)
+-ktutil_OBJECTS = $(am_ktutil_OBJECTS)
+-ktutil_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-ktutil_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+-	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(ktutil_SOURCES)
+-DIST_SOURCES = $(ktutil_SOURCES)
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -148,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -158,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -181,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -199,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -207,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -255,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -335,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -343,26 +277,44 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ man_MANS = ktutil.8
++
++sbin_PROGRAMS = ktutil
++
+ ktutil_SOURCES = \
+ 	add.c					\
+ 	change.c				\
+@@ -374,59 +326,70 @@
+ 	remove.c				\
+ 	rename.c
+ 
++
+ LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
+-	$(LIB_readline) \
+-	$(LIB_roken)
++	$(LIB_sl) \
++	-ledit
++
++subdir = admin
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++sbin_PROGRAMS = ktutil$(EXEEXT)
++PROGRAMS = $(sbin_PROGRAMS)
++
++am_ktutil_OBJECTS = add.$(OBJEXT) change.$(OBJEXT) copy.$(OBJEXT) \
++	get.$(OBJEXT) ktutil.$(OBJEXT) list.$(OBJEXT) purge.$(OBJEXT) \
++	remove.$(OBJEXT) rename.$(OBJEXT)
++ktutil_OBJECTS = $(am_ktutil_OBJECTS)
++ktutil_LDADD = $(LDADD)
++ktutil_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++ktutil_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(ktutil_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(ktutil_SOURCES)
+ 
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps admin/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps admin/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  admin/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
++	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -434,8 +397,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
++	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+ 	done
+ 
+ clean-sbinPROGRAMS:
+@@ -449,19 +412,19 @@
+ 	$(LINK) $(ktutil_LDFLAGS) $(ktutil_OBJECTS) $(ktutil_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -472,9 +435,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -493,8 +458,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -514,10 +479,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -526,7 +499,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -541,6 +513,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -563,9 +536,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -577,7 +554,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -599,10 +576,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -629,8 +605,7 @@
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \
+-	mostlyclean-am
++clean-am: clean-generic clean-libtool clean-sbinPROGRAMS mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+@@ -641,8 +616,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -684,17 +657,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libtool clean-sbinPROGRAMS ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-man8 install-sbinPROGRAMS \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-man uninstall-man8 \
+-	uninstall-sbinPROGRAMS
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-man8 install-sbinPROGRAMS install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am uninstall-man \
++	uninstall-man8 uninstall-sbinPROGRAMS
+ 
+ 
+ install-suid-programs:
+@@ -826,6 +798,7 @@
+ 	$(COMPILE_ET) $<
+ .et.c:
+ 	$(COMPILE_ET) $<
++	$(LIB_roken)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -ruN heimdal-0.6.3-old/appl/afsutil/Makefile.in heimdal-0.6.3/appl/afsutil/Makefile.in
+--- heimdal-0.6.3-old/appl/afsutil/Makefile.in	2004-09-13 22:28:52.000000000 +1000
++++ heimdal-0.6.3/appl/afsutil/Makefile.in	2004-09-14 08:39:41.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(afslog_SOURCES) $(pagsh_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,93 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-bin_PROGRAMS = afslog$(EXEEXT) pagsh$(EXEEXT)
+-subdir = appl/afsutil
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_afslog_OBJECTS = afslog.$(OBJEXT)
+-afslog_OBJECTS = $(am_afslog_OBJECTS)
+-afslog_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-afslog_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-am_pagsh_OBJECTS = pagsh.$(OBJEXT)
+-pagsh_OBJECTS = $(am_pagsh_OBJECTS)
+-pagsh_LDADD = $(LDADD)
+-pagsh_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(afslog_SOURCES) $(pagsh_SOURCES)
+-DIST_SOURCES = $(afslog_SOURCES) $(pagsh_SOURCES)
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -154,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -164,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -187,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -205,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -213,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -261,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -341,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -349,28 +277,48 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = afslog pagsh
++
+ afslog_SOURCES = afslog.c
++
+ pagsh_SOURCES = pagsh.c
++
+ man_MANS = afslog.1
++
+ LDADD = $(LIB_kafs) \
+ 	$(LIB_krb4) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+@@ -378,50 +326,66 @@
+ 	$(LIB_des) \
+ 	$(LIB_roken)
+ 
++subdir = appl/afsutil
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = afslog$(EXEEXT) pagsh$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_afslog_OBJECTS = afslog.$(OBJEXT)
++afslog_OBJECTS = $(am_afslog_OBJECTS)
++afslog_LDADD = $(LDADD)
++afslog_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++afslog_LDFLAGS =
++am_pagsh_OBJECTS = pagsh.$(OBJEXT)
++pagsh_OBJECTS = $(am_pagsh_OBJECTS)
++pagsh_LDADD = $(LDADD)
++pagsh_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++pagsh_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(afslog_SOURCES) $(pagsh_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(afslog_SOURCES) $(pagsh_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/afsutil/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/afsutil/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/afsutil/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -429,8 +393,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -447,19 +411,19 @@
+ 	$(LINK) $(pagsh_LDFLAGS) $(pagsh_OBJECTS) $(pagsh_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -470,9 +434,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -491,8 +457,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -512,10 +478,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -524,7 +498,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -539,6 +512,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -561,9 +535,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -575,7 +553,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -597,10 +575,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -638,8 +615,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -681,17 +656,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-man1 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+-	uninstall-man1
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-man uninstall-man1
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/dceutils/Makefile.in heimdal-0.6.3/appl/dceutils/Makefile.in
+--- heimdal-0.6.3-old/appl/dceutils/Makefile.in	2004-09-13 22:28:53.000000000 +1000
++++ heimdal-0.6.3/appl/dceutils/Makefile.in	2004-09-14 08:39:42.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,86 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-libexec_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
+-subdir = appl/dceutils
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__EXEEXT_1 = k5dcecon$(EXEEXT)
+-@AIX_TRUE@am__EXEEXT_2 = dpagaix$(EXEEXT)
+-am__installdirs = "$(DESTDIR)$(libexecdir)"
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS)
+-am_dpagaix_OBJECTS = dpagaix-dpagaix.$(OBJEXT)
+-dpagaix_OBJECTS = $(am_dpagaix_OBJECTS)
+-am__DEPENDENCIES_1 =
+-dpagaix_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-am_k5dcecon_OBJECTS = k5dcecon.$(OBJEXT)
+-k5dcecon_OBJECTS = $(am_k5dcecon_OBJECTS)
+-k5dcecon_LDADD = $(LDADD)
+-@IRIX_FALSE@k5dcecon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-@IRIX_FALSE@	$(am__DEPENDENCIES_1)
+-@IRIX_TRUE@k5dcecon_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
+-DIST_SOURCES = $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -147,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -157,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -180,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -198,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -206,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -254,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -334,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -342,79 +277,112 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ DFSPROGS = k5dcecon
+ @AIX_TRUE@AIX_DFSPROGS = dpagaix
++
++libexec_PROGRAMS = $(DFSPROGS) $(AIX_DFSPROGS)
++
+ dpagaix_CFLAGS = $(dpagaix_cflags)
+ dpagaix_LDFLAGS = $(dpagaix_ldflags)
+ dpagaix_LDADD = $(dpagaix_ldadd)
++
+ LIB_dce = -ldce
++
+ k5dcecon_SOURCES = k5dcecon.c k5dce.h
++
+ dpagaix_SOURCES = dpagaix.c
+-@IRIX_FALSE@LDADD = $(LIB_roken) $(LIB_dce)
++
+ @IRIX_TRUE@LDADD = $(LIB_dce)
++@IRIX_FALSE@LDADD = $(LIB_roken) $(LIB_dce)
++subdir = appl/dceutils
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++@AIX_TRUE@libexec_PROGRAMS = k5dcecon$(EXEEXT) dpagaix$(EXEEXT)
++@AIX_FALSE@libexec_PROGRAMS = k5dcecon$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS)
++
++am_dpagaix_OBJECTS = dpagaix-dpagaix.$(OBJEXT)
++dpagaix_OBJECTS = $(am_dpagaix_OBJECTS)
++dpagaix_DEPENDENCIES =
++am_k5dcecon_OBJECTS = k5dcecon.$(OBJEXT)
++k5dcecon_OBJECTS = $(am_k5dcecon_OBJECTS)
++k5dcecon_LDADD = $(LDADD)
++@IRIX_TRUE@k5dcecon_DEPENDENCIES =
++@IRIX_FALSE@k5dcecon_DEPENDENCIES =
++k5dcecon_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/dceutils/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/dceutils/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/dceutils/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -422,8 +390,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -437,19 +405,19 @@
+ 	$(LINK) $(k5dcecon_LDFLAGS) $(k5dcecon_OBJECTS) $(k5dcecon_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ dpagaix-dpagaix.o: dpagaix.c
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dpagaix_CFLAGS) $(CFLAGS) -c -o dpagaix-dpagaix.o `test -f 'dpagaix.c' || echo '$(srcdir)/'`dpagaix.c
+@@ -470,6 +438,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -478,7 +454,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -493,6 +468,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -515,9 +491,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -529,7 +509,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -551,10 +531,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -593,8 +572,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -634,16 +611,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libexecPROGRAMS clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libexecPROGRAMS install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-libexecPROGRAMS
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am \
++	uninstall-libexecPROGRAMS
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/ftp/common/Makefile.in heimdal-0.6.3/appl/ftp/common/Makefile.in
+--- heimdal-0.6.3-old/appl/ftp/common/Makefile.in	2004-09-13 22:28:54.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/common/Makefile.in	2004-09-14 08:39:43.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(libcommon_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,76 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = appl/ftp/common
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-ARFLAGS = cru
+-LIBRARIES = $(noinst_LIBRARIES)
+-libcommon_a_AR = $(AR) $(ARFLAGS)
+-libcommon_a_LIBADD =
+-am_libcommon_a_OBJECTS = sockbuf.$(OBJEXT) buffer.$(OBJEXT)
+-libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libcommon_a_SOURCES)
+-DIST_SOURCES = $(libcommon_a_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -137,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -147,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -170,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -188,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -196,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -244,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -324,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -332,64 +277,83 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) 
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ noinst_LIBRARIES = libcommon.a
++
+ libcommon_a_SOURCES = \
+ 	sockbuf.c \
+ 	buffer.c \
+ 	common.h
+ 
++subdir = appl/ftp/common
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(noinst_LIBRARIES)
++
++libcommon_a_AR = $(AR) cru
++libcommon_a_LIBADD =
++am_libcommon_a_OBJECTS = sockbuf.$(OBJEXT) buffer.$(OBJEXT)
++libcommon_a_OBJECTS = $(am_libcommon_a_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libcommon_a_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(libcommon_a_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/common/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/common/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/ftp/common/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+@@ -399,19 +363,19 @@
+ 	$(RANLIB) libcommon.a
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -423,6 +387,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -431,7 +403,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -446,6 +417,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -468,9 +440,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -482,7 +458,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -504,6 +480,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LIBRARIES) all-local
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -543,8 +520,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -584,15 +559,14 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftp/Makefile.in heimdal-0.6.3/appl/ftp/ftp/Makefile.in
+--- heimdal-0.6.3-old/appl/ftp/ftp/Makefile.in	2004-09-13 22:28:55.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftp/Makefile.in	2004-09-14 08:39:43.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(ftp_SOURCES) $(EXTRA_ftp_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,96 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = ftp$(EXEEXT)
+-subdir = appl/ftp/ftp
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am__ftp_SOURCES_DIST = cmds.c cmdtab.c extern.h ftp.c ftp_locl.h \
+-	ftp_var.h main.c pathnames.h ruserpass.c domacro.c globals.c \
+-	security.c security.h krb4.c kauth.c gssapi.c
+-@KRB4_TRUE@am__objects_1 = krb4.$(OBJEXT) kauth.$(OBJEXT)
+-@KRB5_TRUE@am__objects_2 = gssapi.$(OBJEXT)
+-am_ftp_OBJECTS = cmds.$(OBJEXT) cmdtab.$(OBJEXT) ftp.$(OBJEXT) \
+-	main.$(OBJEXT) ruserpass.$(OBJEXT) domacro.$(OBJEXT) \
+-	globals.$(OBJEXT) security.$(OBJEXT) $(am__objects_1) \
+-	$(am__objects_2)
+-ftp_OBJECTS = $(am_ftp_OBJECTS)
+-ftp_LDADD = $(LDADD)
+-@KRB5_TRUE@am__DEPENDENCIES_1 =  \
+-@KRB5_TRUE@	$(top_builddir)/lib/gssapi/libgssapi.la
+-@KRB5_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-am__DEPENDENCIES_3 =
+-ftp_DEPENDENCIES = ../common/libcommon.a $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_3)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(ftp_SOURCES) $(EXTRA_ftp_SOURCES)
+-DIST_SOURCES = $(am__ftp_SOURCES_DIST) $(EXTRA_ftp_SOURCES)
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -157,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -167,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -190,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -208,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -216,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -264,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -344,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -352,28 +277,47 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des)
++
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/../common -I/usr/include/editline $(INCLUDE_krb4) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = ftp
++
+ CHECK_LOCAL = 
++
+ @KRB4_TRUE@krb4_sources = krb4.c kauth.c
+ @KRB5_TRUE@krb5_sources = gssapi.c
++
+ ftp_SOURCES = \
+ 	cmds.c \
+ 	cmdtab.c \
+@@ -391,8 +335,11 @@
+ 	$(krb4_sources) \
+ 	$(krb5_sources)
+ 
++
+ EXTRA_ftp_SOURCES = krb4.c kauth.c gssapi.c
++
+ man_MANS = ftp.1
++
+ LDADD = \
+ 	../common/libcommon.a \
+ 	$(LIB_gssapi) \
+@@ -400,52 +347,71 @@
+ 	$(LIB_krb4) \
+ 	$(LIB_des) \
+ 	$(LIB_roken) \
+-	$(LIB_readline)
++	-ledit
++
++subdir = appl/ftp/ftp
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = ftp$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am__ftp_SOURCES_DIST = cmds.c cmdtab.c extern.h ftp.c ftp_locl.h \
++	ftp_var.h main.c pathnames.h ruserpass.c domacro.c globals.c \
++	security.c security.h krb4.c kauth.c gssapi.c
++@KRB4_TRUE@am__objects_1 = krb4.$(OBJEXT) kauth.$(OBJEXT)
++@KRB5_TRUE@am__objects_2 = gssapi.$(OBJEXT)
++am_ftp_OBJECTS = cmds.$(OBJEXT) cmdtab.$(OBJEXT) ftp.$(OBJEXT) \
++	main.$(OBJEXT) ruserpass.$(OBJEXT) domacro.$(OBJEXT) \
++	globals.$(OBJEXT) security.$(OBJEXT) $(am__objects_1) \
++	$(am__objects_2)
++ftp_OBJECTS = $(am_ftp_OBJECTS)
++ftp_LDADD = $(LDADD)
++@KRB5_TRUE@ftp_DEPENDENCIES = ../common/libcommon.a \
++@KRB5_TRUE@	$(top_builddir)/lib/gssapi/libgssapi.la \
++@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@ftp_DEPENDENCIES = ../common/libcommon.a
++ftp_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__ftp_SOURCES_DIST) $(EXTRA_ftp_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(ftp_SOURCES) $(EXTRA_ftp_SOURCES)
+ 
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/ftp/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/ftp/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/ftp/ftp/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -453,8 +419,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -468,19 +434,19 @@
+ 	$(LINK) $(ftp_LDFLAGS) $(ftp_OBJECTS) $(ftp_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -491,9 +457,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -512,8 +480,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -533,10 +501,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -545,7 +521,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -560,6 +535,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -582,9 +558,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -596,7 +576,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -618,10 +598,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -659,8 +638,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -702,17 +679,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-man1 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+-	uninstall-man1
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-man uninstall-man1
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftpd/Makefile.in heimdal-0.6.3/appl/ftp/ftpd/Makefile.in
+--- heimdal-0.6.3-old/appl/ftp/ftpd/Makefile.in	2004-09-13 22:28:56.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftpd/Makefile.in	2004-09-14 08:39:43.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(ftpd_SOURCES) $(EXTRA_ftpd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,101 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ftpcmd.c
+-libexec_PROGRAMS = ftpd$(EXEEXT)
+-subdir = appl/ftp/ftpd
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS)
+-am__ftpd_SOURCES_DIST = extern.h ftpcmd.y ftpd.c ftpd_locl.h logwtmp.c \
+-	ls.c pathnames.h popen.c security.c krb4.c kauth.c gssapi.c \
+-	gss_userok.c
+-@KRB4_TRUE@am__objects_1 = krb4.$(OBJEXT) kauth.$(OBJEXT)
+-@KRB5_TRUE@am__objects_2 = gssapi.$(OBJEXT) gss_userok.$(OBJEXT)
+-am_ftpd_OBJECTS = ftpcmd.$(OBJEXT) ftpd.$(OBJEXT) logwtmp.$(OBJEXT) \
+-	ls.$(OBJEXT) popen.$(OBJEXT) security.$(OBJEXT) \
+-	$(am__objects_1) $(am__objects_2)
+-ftpd_OBJECTS = $(am_ftpd_OBJECTS)
+-ftpd_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-@KRB5_TRUE@am__DEPENDENCIES_2 =  \
+-@KRB5_TRUE@	$(top_builddir)/lib/gssapi/libgssapi.la
+-@KRB5_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-am__DEPENDENCIES_4 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-ftpd_DEPENDENCIES = ../common/libcommon.a $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+-	$(AM_YFLAGS)
+-SOURCES = $(ftpd_SOURCES) $(EXTRA_ftpd_SOURCES)
+-DIST_SOURCES = $(am__ftpd_SOURCES_DIST) $(EXTRA_ftpd_SOURCES)
+-man5dir = $(mandir)/man5
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -162,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -172,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -195,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -213,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -221,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -269,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -349,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -357,28 +277,47 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++libexec_PROGRAMS = ftpd
++
+ CHECK_LOCAL = 
++
+ @KRB4_TRUE@krb4_sources = krb4.c kauth.c
+ @KRB5_TRUE@krb5_sources = gssapi.c gss_userok.c
++
+ ftpd_SOURCES = \
+ 	extern.h	\
+ 	ftpcmd.y	\
+@@ -392,9 +331,13 @@
+ 	$(krb4_sources) \
+ 	$(krb5_sources)
+ 
++
+ EXTRA_ftpd_SOURCES = krb4.c kauth.c gssapi.c gss_userok.c
++
+ CLEANFILES = security.c security.h krb4.c gssapi.c ftpcmd.c
++
+ man_MANS = ftpd.8 ftpusers.5
++
+ LDADD = ../common/libcommon.a \
+ 	$(LIB_otp) \
+ 	$(LIB_gssapi) \
+@@ -404,50 +347,72 @@
+ 	$(LIB_des) \
+ 	$(LIB_roken)
+ 
++subdir = appl/ftp/ftpd
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++libexec_PROGRAMS = ftpd$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS)
++
++am__ftpd_SOURCES_DIST = extern.h ftpcmd.y ftpd.c ftpd_locl.h logwtmp.c \
++	ls.c pathnames.h popen.c security.c krb4.c kauth.c gssapi.c \
++	gss_userok.c
++@KRB4_TRUE@am__objects_1 = krb4.$(OBJEXT) kauth.$(OBJEXT)
++@KRB5_TRUE@am__objects_2 = gssapi.$(OBJEXT) gss_userok.$(OBJEXT)
++am_ftpd_OBJECTS = ftpcmd.$(OBJEXT) ftpd.$(OBJEXT) logwtmp.$(OBJEXT) \
++	ls.$(OBJEXT) popen.$(OBJEXT) security.$(OBJEXT) \
++	$(am__objects_1) $(am__objects_2)
++ftpd_OBJECTS = $(am_ftpd_OBJECTS)
++ftpd_LDADD = $(LDADD)
++@KRB5_TRUE@ftpd_DEPENDENCIES = ../common/libcommon.a \
++@KRB5_TRUE@	$(top_builddir)/lib/gssapi/libgssapi.la \
++@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la \
++@KRB5_TRUE@	$(top_builddir)/lib/kafs/libkafs.la
++@KRB5_FALSE@ftpd_DEPENDENCIES = ../common/libcommon.a \
++@KRB5_FALSE@	$(top_builddir)/lib/kafs/libkafs.la
++ftpd_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
++LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
++DIST_SOURCES = $(am__ftpd_SOURCES_DIST) $(EXTRA_ftpd_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am ftpcmd.c
++SOURCES = $(ftpd_SOURCES) $(EXTRA_ftpd_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj .y
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/ftpd/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/ftpd/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/ftp/ftpd/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -455,8 +420,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -470,22 +435,22 @@
+ 	$(LINK) $(ftpd_LDFLAGS) $(ftpd_OBJECTS) $(ftpd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .y.c:
+-	$(YACCCOMPILE) $<
++	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+ 	if test -f y.tab.h; then \
+ 	  to=`echo "$*_H" | sed \
+                 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
+@@ -513,9 +478,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man5dir = $(mandir)/man5
+ install-man5: $(man5_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man5dir)
+ 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -534,8 +501,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \
+ 	done
+ uninstall-man5:
+ 	@$(NORMAL_UNINSTALL)
+@@ -555,12 +522,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man5dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -579,8 +548,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -600,10 +569,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -612,7 +589,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -627,6 +603,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -649,9 +626,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -663,7 +644,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -685,10 +666,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -729,8 +709,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -766,23 +744,21 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
+-	uninstall-man
++uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS uninstall-man
+ 
+ uninstall-man: uninstall-man5 uninstall-man8
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libexecPROGRAMS clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libexecPROGRAMS install-man \
+-	install-man5 install-man8 install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-man5 install-man8 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+ 	uninstall-libexecPROGRAMS uninstall-man uninstall-man5 \
+ 	uninstall-man8
+ 
+diff -ruN heimdal-0.6.3-old/appl/ftp/Makefile.in heimdal-0.6.3/appl/ftp/Makefile.in
+--- heimdal-0.6.3-old/appl/ftp/Makefile.in	2004-09-13 22:28:53.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/Makefile.in	2004-09-14 08:39:42.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,68 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-subdir = appl/ftp
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -126,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -136,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -159,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -177,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -185,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -233,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -313,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -321,59 +277,67 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ SUBDIRS = common ftp ftpd
++subdir = appl/ftp
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/ftp/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/ftp/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -444,6 +408,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -452,7 +424,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -478,6 +449,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -500,9 +472,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -514,7 +490,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -531,13 +507,13 @@
+ 	done
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -551,6 +527,7 @@
+ all-am: Makefile all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -588,8 +565,6 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -632,14 +607,18 @@
+ 	check-am check-local clean clean-generic clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++	info-recursive install install-am install-data install-data-am \
++	install-data-recursive install-exec install-exec-am \
++	install-exec-recursive install-info install-info-am \
++	install-info-recursive install-man install-recursive \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
++	tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/kf/Makefile.in heimdal-0.6.3/appl/kf/Makefile.in
+--- heimdal-0.6.3-old/appl/kf/Makefile.in	2004-09-13 22:28:57.000000000 +1000
++++ heimdal-0.6.3/appl/kf/Makefile.in	2004-09-14 08:39:44.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(kf_SOURCES) $(kfd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,92 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = kf$(EXEEXT)
+-libexec_PROGRAMS = kfd$(EXEEXT)
+-subdir = appl/kf
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+-am_kf_OBJECTS = kf.$(OBJEXT)
+-kf_OBJECTS = $(am_kf_OBJECTS)
+-kf_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-kf_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am_kfd_OBJECTS = kfd.$(OBJEXT)
+-kfd_OBJECTS = $(am_kfd_OBJECTS)
+-kfd_LDADD = $(LDADD)
+-kfd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kf_SOURCES) $(kfd_SOURCES)
+-DIST_SOURCES = $(kf_SOURCES) $(kfd_SOURCES)
+-man1dir = $(mandir)/man1
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -153,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -163,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -186,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -204,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -212,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -260,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -340,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -348,77 +277,114 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = kf
++
++libexec_PROGRAMS = kfd
++
+ man_MANS = kf.1 kfd.8
++
+ kf_SOURCES = kf.c kf_locl.h
++
+ kfd_SOURCES = kfd.c kf_locl.h
++
+ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++subdir = appl/kf
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = kf$(EXEEXT)
++libexec_PROGRAMS = kfd$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
++
++am_kf_OBJECTS = kf.$(OBJEXT)
++kf_OBJECTS = $(am_kf_OBJECTS)
++kf_LDADD = $(LDADD)
++kf_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kf_LDFLAGS =
++am_kfd_OBJECTS = kfd.$(OBJEXT)
++kfd_OBJECTS = $(am_kfd_OBJECTS)
++kfd_LDADD = $(LDADD)
++kfd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kfd_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(kf_SOURCES) $(kfd_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(kf_SOURCES) $(kfd_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/kf/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/kf/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/kf/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -426,8 +392,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -436,17 +402,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -454,8 +421,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -472,19 +439,19 @@
+ 	$(LINK) $(kfd_LDFLAGS) $(kfd_OBJECTS) $(kfd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -495,9 +462,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -516,8 +485,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -537,12 +506,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -561,8 +532,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -582,10 +553,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -594,7 +573,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -609,6 +587,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -631,9 +610,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -645,7 +628,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -667,10 +650,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -709,8 +691,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -755,17 +735,16 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-libexecPROGRAMS install-man install-man1 install-man8 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
+-	uninstall-man8
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-libexecPROGRAMS \
++	install-man install-man1 install-man8 install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-libexecPROGRAMS uninstall-man \
++	uninstall-man1 uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/kx/Makefile.in heimdal-0.6.3/appl/kx/Makefile.in
+--- heimdal-0.6.3-old/appl/kx/Makefile.in	2004-09-13 22:28:58.000000000 +1000
++++ heimdal-0.6.3/appl/kx/Makefile.in	2004-09-14 08:39:44.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,9 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-SOURCES = $(kx_SOURCES) $(EXTRA_kx_SOURCES) $(kxd_SOURCES) $(EXTRA_kxd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -30,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -44,111 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-@HAVE_X_TRUE@bin_PROGRAMS = kx$(EXEEXT)
+-@HAVE_X_TRUE@libexec_PROGRAMS = kxd$(EXEEXT)
+-subdir = appl/kx
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+-am__kx_SOURCES_DIST = kx.c kx.h common.c context.c krb4.c krb5.c \
+-	writeauth.c
+-@NEED_WRITEAUTH_TRUE@am__objects_1 = writeauth.$(OBJEXT)
+-am_kx_OBJECTS = kx.$(OBJEXT) common.$(OBJEXT) context.$(OBJEXT) \
+-	krb4.$(OBJEXT) krb5.$(OBJEXT) $(am__objects_1)
+-kx_OBJECTS = $(am_kx_OBJECTS)
+-kx_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-@KRB5_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-kx_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-am__kxd_SOURCES_DIST = kxd.c kx.h common.c context.c krb4.c krb5.c \
+-	writeauth.c
+-am_kxd_OBJECTS = kxd.$(OBJEXT) common.$(OBJEXT) context.$(OBJEXT) \
+-	krb4.$(OBJEXT) krb5.$(OBJEXT) $(am__objects_1)
+-kxd_OBJECTS = $(am_kxd_OBJECTS)
+-kxd_LDADD = $(LDADD)
+-kxd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+-SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kx_SOURCES) $(EXTRA_kx_SOURCES) $(kxd_SOURCES) \
+-	$(EXTRA_kxd_SOURCES)
+-DIST_SOURCES = $(am__kx_SOURCES_DIST) $(EXTRA_kx_SOURCES) \
+-	$(am__kxd_SOURCES_DIST) $(EXTRA_kxd_SOURCES)
+-man1dir = $(mandir)/man1
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -173,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -183,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -206,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -224,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -232,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -280,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -308,6 +218,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
++
+ WFLAGS = @WFLAGS@ $(WFLAGS_NOIMPLICITINT)
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+ WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
+@@ -360,7 +271,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -368,29 +278,52 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(X_CFLAGS)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++@HAVE_X_FALSE@bin_PROGRAMS = 
++
++@HAVE_X_TRUE@bin_PROGRAMS = kx
+ @HAVE_X_FALSE@bin_SCRIPTS = 
+ @HAVE_X_TRUE@bin_SCRIPTS = rxterm rxtelnet tenletxr
++@HAVE_X_FALSE@libexec_PROGRAMS = 
++@HAVE_X_TRUE@libexec_PROGRAMS = kxd
++
+ CLEANFILES = rxterm rxtelnet tenletxr
++
+ @NEED_WRITEAUTH_TRUE@XauWriteAuth_c = writeauth.c
++
+ kx_SOURCES = \
+ 	kx.c \
+ 	kx.h \
+@@ -400,7 +333,9 @@
+ 	krb5.c \
+ 	$(XauWriteAuth_c)
+ 
++
+ EXTRA_kx_SOURCES = writeauth.c
++
+ kxd_SOURCES = \
+ 	kxd.c \
+ 	kx.h \
+@@ -410,9 +345,13 @@
+ 	krb5.c \
+ 	$(XauWriteAuth_c)
+ 
++
+ EXTRA_kxd_SOURCES = writeauth.c
++
+ EXTRA_DIST = rxterm.in rxtelnet.in tenletxr.in
++
+ man_MANS = kx.1 rxtelnet.1 rxterm.1 tenletxr.1 kxd.8
++
+ LDADD = \
+ 	$(LIB_kafs)				\
+ 	$(LIB_krb5) \
+@@ -421,50 +360,81 @@
+ 	$(LIB_roken)				\
+ 	$(X_LIBS) $(LIB_XauReadAuth) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
+ 
++subdir = appl/kx
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++@HAVE_X_TRUE@bin_PROGRAMS = kx$(EXEEXT)
++@HAVE_X_FALSE@bin_PROGRAMS =
++@HAVE_X_TRUE@libexec_PROGRAMS = kxd$(EXEEXT)
++@HAVE_X_FALSE@libexec_PROGRAMS =
++PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
++
++am__kx_SOURCES_DIST = kx.c kx.h common.c context.c krb4.c krb5.c \
++	writeauth.c
++@NEED_WRITEAUTH_TRUE@am__objects_1 = writeauth.$(OBJEXT)
++am_kx_OBJECTS = kx.$(OBJEXT) common.$(OBJEXT) context.$(OBJEXT) \
++	krb4.$(OBJEXT) krb5.$(OBJEXT) $(am__objects_1)
++kx_OBJECTS = $(am_kx_OBJECTS)
++kx_LDADD = $(LDADD)
++@KRB5_TRUE@kx_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@kx_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la
++kx_LDFLAGS =
++am__kxd_SOURCES_DIST = kxd.c kx.h common.c context.c krb4.c krb5.c \
++	writeauth.c
++am_kxd_OBJECTS = kxd.$(OBJEXT) common.$(OBJEXT) context.$(OBJEXT) \
++	krb4.$(OBJEXT) krb5.$(OBJEXT) $(am__objects_1)
++kxd_OBJECTS = $(am_kxd_OBJECTS)
++kxd_LDADD = $(LDADD)
++@KRB5_TRUE@kxd_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@kxd_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la
++kxd_LDFLAGS =
++SCRIPTS = $(bin_SCRIPTS)
++
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__kx_SOURCES_DIST) $(EXTRA_kx_SOURCES) \
++	$(am__kxd_SOURCES_DIST) $(EXTRA_kxd_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(kx_SOURCES) $(EXTRA_kx_SOURCES) $(kxd_SOURCES) $(EXTRA_kxd_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/kx/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/kx/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/kx/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -472,8 +442,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -482,17 +452,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -500,8 +471,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -516,15 +487,16 @@
+ kxd$(EXEEXT): $(kxd_OBJECTS) $(kxd_DEPENDENCIES) 
+ 	@rm -f kxd$(EXEEXT)
+ 	$(LINK) $(kxd_LDFLAGS) $(kxd_OBJECTS) $(kxd_LDADD) $(LIBS)
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+ 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
++	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
++	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -532,24 +504,24 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -560,9 +532,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -581,8 +555,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -602,12 +576,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -626,8 +602,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -647,10 +623,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -659,7 +643,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -674,6 +657,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -696,9 +680,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -710,7 +698,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -732,10 +720,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -775,8 +762,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -822,16 +807,15 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-binSCRIPTS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libexecPROGRAMS install-man \
+-	install-man1 install-man8 install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-binSCRIPTS uninstall-info-am \
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-binSCRIPTS install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-man1 install-man8 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am \
+ 	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
+ 	uninstall-man8
+ 
+diff -ruN heimdal-0.6.3-old/appl/login/Makefile.in heimdal-0.6.3/appl/login/Makefile.in
+--- heimdal-0.6.3-old/appl/login/Makefile.in	2004-09-13 22:28:59.000000000 +1000
++++ heimdal-0.6.3/appl/login/Makefile.in	2004-09-14 08:39:45.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(login_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,91 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-bin_PROGRAMS = login$(EXEEXT)
+-subdir = appl/login
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_login_OBJECTS = conf.$(OBJEXT) env.$(OBJEXT) login.$(OBJEXT) \
+-	login_access.$(OBJEXT) osfc2.$(OBJEXT) read_string.$(OBJEXT) \
+-	shadow.$(OBJEXT) stty_default.$(OBJEXT) tty.$(OBJEXT) \
+-	utmp_login.$(OBJEXT) utmpx_login.$(OBJEXT)
+-login_OBJECTS = $(am_login_OBJECTS)
+-login_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-login_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+-	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(login_SOURCES)
+-DIST_SOURCES = $(login_SOURCES)
+-man1dir = $(mandir)/man1
+-man5dir = $(mandir)/man5
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -152,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -162,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -185,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -203,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -211,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -259,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -339,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -347,26 +277,44 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ man_MANS = login.1 login.access.5
++
++bin_PROGRAMS = login
++
+ login_SOURCES = \
+ 		conf.c				\
+ 		env.c				\
+@@ -382,6 +330,7 @@
+ 		utmp_login.c			\
+ 		utmpx_login.c
+ 
++
+ LDADD = $(LIB_otp) \
+ 	$(LIB_kafs) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+@@ -392,50 +341,62 @@
+ 	$(LIB_security) \
+ 	$(DBLIB)
+ 
++subdir = appl/login
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = login$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_login_OBJECTS = conf.$(OBJEXT) env.$(OBJEXT) login.$(OBJEXT) \
++	login_access.$(OBJEXT) osfc2.$(OBJEXT) read_string.$(OBJEXT) \
++	shadow.$(OBJEXT) stty_default.$(OBJEXT) tty.$(OBJEXT) \
++	utmp_login.$(OBJEXT) utmpx_login.$(OBJEXT)
++login_OBJECTS = $(am_login_OBJECTS)
++login_LDADD = $(LDADD)
++login_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++login_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(login_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(login_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/login/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/login/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/login/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -443,8 +404,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -458,19 +419,19 @@
+ 	$(LINK) $(login_LDFLAGS) $(login_OBJECTS) $(login_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -481,9 +442,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -502,8 +465,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -523,12 +486,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man5dir = $(mandir)/man5
+ install-man5: $(man5_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man5dir)
+ 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -547,8 +512,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \
+ 	done
+ uninstall-man5:
+ 	@$(NORMAL_UNINSTALL)
+@@ -568,10 +533,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man5dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -580,7 +553,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -595,6 +567,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -617,9 +590,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -631,7 +608,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -653,10 +630,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -694,8 +670,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -737,17 +711,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-man1 \
+-	install-man5 install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-man uninstall-man1 uninstall-man5
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-man5 install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-man uninstall-man1 uninstall-man5
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/Makefile.in heimdal-0.6.3/appl/Makefile.in
+--- heimdal-0.6.3-old/appl/Makefile.in	2004-09-13 22:28:51.000000000 +1000
++++ heimdal-0.6.3/appl/Makefile.in	2004-09-14 08:39:41.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,69 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = appl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = afsutil ftp login otp popper push rsh rcp su xnlock \
+-	telnet test kx kf dceutils
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -127,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -137,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -160,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -178,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -186,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -234,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -314,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -322,25 +277,40 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ @OTP_TRUE@dir_otp = otp
+ @DCE_TRUE@dir_dce = dceutils
+ SUBDIRS = \
+@@ -360,39 +330,33 @@
+ 	  kf					\
+ 	  $(dir_dce)
+ 
++subdir = appl
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++DIST_SUBDIRS = afsutil ftp login otp popper push rsh rcp su xnlock \
++	telnet test kx kf dceutils
+ all: all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -463,6 +427,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -471,7 +443,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -497,6 +468,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -519,9 +491,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -533,7 +509,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -550,13 +526,13 @@
+ 	done
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -570,6 +546,7 @@
+ all-am: Makefile all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -607,8 +584,6 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -651,14 +626,18 @@
+ 	check-am check-local clean clean-generic clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++	info-recursive install install-am install-data install-data-am \
++	install-data-recursive install-exec install-exec-am \
++	install-exec-recursive install-info install-info-am \
++	install-info-recursive install-man install-recursive \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
++	tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/otp/Makefile.in heimdal-0.6.3/appl/otp/Makefile.in
+--- heimdal-0.6.3-old/appl/otp/Makefile.in	2004-09-13 22:29:00.000000000 +1000
++++ heimdal-0.6.3/appl/otp/Makefile.in	2004-09-14 08:39:45.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(otp_SOURCES) $(otpprint_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,84 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-bin_PROGRAMS = otp$(EXEEXT) otpprint$(EXEEXT)
+-subdir = appl/otp
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_otp_OBJECTS = otp.$(OBJEXT)
+-otp_OBJECTS = $(am_otp_OBJECTS)
+-otp_LDADD = $(LDADD)
+-otp_DEPENDENCIES = $(top_builddir)/lib/otp/libotp.la
+-am_otpprint_OBJECTS = otpprint.$(OBJEXT)
+-otpprint_OBJECTS = $(am_otpprint_OBJECTS)
+-otpprint_LDADD = $(LDADD)
+-otpprint_DEPENDENCIES = $(top_builddir)/lib/otp/libotp.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(otp_SOURCES) $(otpprint_SOURCES)
+-DIST_SOURCES = $(otp_SOURCES) $(otpprint_SOURCES)
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -145,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -155,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -178,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -196,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -204,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -252,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -332,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -340,76 +277,106 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = otp otpprint
+ bin_SUIDS = otp
+ otp_SOURCES = otp.c otp_locl.h
+ otpprint_SOURCES = otpprint.c otp_locl.h
++
+ man_MANS = otp.1  otpprint.1
++
+ LDADD = \
+-	$(top_builddir)/lib/otp/libotp.la
++	$(LIB_otp)
++
++subdir = appl/otp
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = otp$(EXEEXT) otpprint$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_otp_OBJECTS = otp.$(OBJEXT)
++otp_OBJECTS = $(am_otp_OBJECTS)
++otp_LDADD = $(LDADD)
++otp_DEPENDENCIES =
++otp_LDFLAGS =
++am_otpprint_OBJECTS = otpprint.$(OBJEXT)
++otpprint_OBJECTS = $(am_otpprint_OBJECTS)
++otpprint_LDADD = $(LDADD)
++otpprint_DEPENDENCIES =
++otpprint_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(otp_SOURCES) $(otpprint_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(otp_SOURCES) $(otpprint_SOURCES)
+ 
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/otp/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/otp/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/otp/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -417,8 +384,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -435,19 +402,19 @@
+ 	$(LINK) $(otpprint_LDFLAGS) $(otpprint_OBJECTS) $(otpprint_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -458,9 +425,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -479,8 +448,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -500,10 +469,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -512,7 +489,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -527,6 +503,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -549,9 +526,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -563,7 +544,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -585,10 +566,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -626,8 +606,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -669,17 +647,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-man1 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+-	uninstall-man1
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-man uninstall-man1
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/popper/Makefile.in heimdal-0.6.3/appl/popper/Makefile.in
+--- heimdal-0.6.3-old/appl/popper/Makefile.in	2004-09-13 22:29:01.000000000 +1000
++++ heimdal-0.6.3/appl/popper/Makefile.in	2004-09-14 08:39:46.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = pop_debug.c $(popper_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,99 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-noinst_PROGRAMS = pop_debug$(EXEEXT)
+-libexec_PROGRAMS = popper$(EXEEXT)
+-subdir = appl/popper
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)"
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+-pop_debug_SOURCES = pop_debug.c
+-pop_debug_OBJECTS = pop_debug.$(OBJEXT)
+-pop_debug_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-@KRB5_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-pop_debug_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_popper_OBJECTS = pop_dele.$(OBJEXT) pop_dropcopy.$(OBJEXT) \
+-	pop_dropinfo.$(OBJEXT) pop_get_command.$(OBJEXT) \
+-	pop_init.$(OBJEXT) pop_last.$(OBJEXT) pop_list.$(OBJEXT) \
+-	pop_log.$(OBJEXT) pop_msg.$(OBJEXT) pop_parse.$(OBJEXT) \
+-	pop_pass.$(OBJEXT) pop_quit.$(OBJEXT) pop_rset.$(OBJEXT) \
+-	pop_send.$(OBJEXT) pop_stat.$(OBJEXT) pop_updt.$(OBJEXT) \
+-	pop_user.$(OBJEXT) pop_uidl.$(OBJEXT) pop_xover.$(OBJEXT) \
+-	popper.$(OBJEXT) maildir.$(OBJEXT)
+-popper_OBJECTS = $(am_popper_OBJECTS)
+-popper_LDADD = $(LDADD)
+-popper_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = pop_debug.c $(popper_SOURCES)
+-DIST_SOURCES = pop_debug.c $(popper_SOURCES)
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -160,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -170,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -193,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -211,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -219,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -267,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -347,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -355,25 +277,44 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++noinst_PROGRAMS = pop_debug
++
++libexec_PROGRAMS = popper
++
+ popper_SOURCES = \
+ 	pop_dele.c pop_dropcopy.c pop_dropinfo.c \
+ 	pop_get_command.c pop_init.c \
+@@ -383,9 +324,11 @@
+ 	pop_user.c pop_uidl.c pop_xover.c popper.c \
+ 	maildir.c popper.h version.h
+ 
++
+ EXTRA_DIST = pop3.rfc1081 pop3e.rfc1082 \
+ 	popper.README.release README-FIRST README-KRB4
+ 
++
+ LDADD = \
+ 	$(LIB_otp) \
+ 	$(LIB_krb5) \
+@@ -394,51 +337,77 @@
+ 	$(LIB_roken) \
+ 	$(DBLIB)
+ 
++
+ man_MANS = popper.8
++subdir = appl/popper
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++libexec_PROGRAMS = popper$(EXEEXT)
++noinst_PROGRAMS = pop_debug$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
++
++pop_debug_SOURCES = pop_debug.c
++pop_debug_OBJECTS = pop_debug.$(OBJEXT)
++pop_debug_LDADD = $(LDADD)
++@KRB5_TRUE@pop_debug_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@pop_debug_DEPENDENCIES =
++pop_debug_LDFLAGS =
++am_popper_OBJECTS = pop_dele.$(OBJEXT) pop_dropcopy.$(OBJEXT) \
++	pop_dropinfo.$(OBJEXT) pop_get_command.$(OBJEXT) \
++	pop_init.$(OBJEXT) pop_last.$(OBJEXT) pop_list.$(OBJEXT) \
++	pop_log.$(OBJEXT) pop_msg.$(OBJEXT) pop_parse.$(OBJEXT) \
++	pop_pass.$(OBJEXT) pop_quit.$(OBJEXT) pop_rset.$(OBJEXT) \
++	pop_send.$(OBJEXT) pop_stat.$(OBJEXT) pop_updt.$(OBJEXT) \
++	pop_user.$(OBJEXT) pop_uidl.$(OBJEXT) pop_xover.$(OBJEXT) \
++	popper.$(OBJEXT) maildir.$(OBJEXT)
++popper_OBJECTS = $(am_popper_OBJECTS)
++popper_LDADD = $(LDADD)
++@KRB5_TRUE@popper_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@popper_DEPENDENCIES =
++popper_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = pop_debug.c $(popper_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = README $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = pop_debug.c $(popper_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/popper/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/popper/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/popper/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -446,8 +415,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -471,19 +440,19 @@
+ 	$(LINK) $(popper_LDFLAGS) $(popper_OBJECTS) $(popper_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -494,9 +463,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -515,8 +486,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -536,10 +507,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -548,7 +527,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -563,6 +541,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -585,9 +564,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -599,7 +582,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -621,10 +604,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -663,8 +645,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -700,8 +680,7 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
+-	uninstall-man
++uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS uninstall-man
+ 
+ uninstall-man: uninstall-man8
+ 
+@@ -709,15 +688,15 @@
+ 	clean clean-generic clean-libexecPROGRAMS clean-libtool \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-libexecPROGRAMS \
+-	install-man install-man8 install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-libexecPROGRAMS uninstall-man uninstall-man8
++	dvi-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-libexecPROGRAMS install-man \
++	install-man8 install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-info-am uninstall-libexecPROGRAMS \
++	uninstall-man uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/push/Makefile.in heimdal-0.6.3/appl/push/Makefile.in
+--- heimdal-0.6.3-old/appl/push/Makefile.in	2004-09-13 22:29:02.000000000 +1000
++++ heimdal-0.6.3/appl/push/Makefile.in	2004-09-14 08:39:46.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,9 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-SOURCES = $(push_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -30,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -44,88 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-libexec_PROGRAMS = push$(EXEEXT)
+-subdir = appl/push
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS)
+-am_push_OBJECTS = push.$(OBJEXT)
+-push_OBJECTS = $(am_push_OBJECTS)
+-push_LDADD = $(LDADD)
+-@KRB5_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-am__DEPENDENCIES_2 =
+-push_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2)
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+-SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(push_SOURCES)
+-DIST_SOURCES = $(push_SOURCES)
+-man1dir = $(mandir)/man1
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -150,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -160,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -183,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -201,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -209,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -257,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -337,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -345,80 +277,113 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(INCLUDE_hesiod)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ bin_SCRIPTS = pfrom
++
++libexec_PROGRAMS = push
++
+ push_SOURCES = push.c push_locl.h
++
+ man_MANS = push.8 pfrom.1
++
+ CLEANFILES = pfrom
++
+ EXTRA_DIST = pfrom.in $(man_MANS)
++
+ LDADD = $(LIB_krb5) \
+ 	$(LIB_krb4) \
+ 	$(LIB_des) \
+ 	$(LIB_roken) \
+ 	$(LIB_hesiod)
+ 
++subdir = appl/push
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++libexec_PROGRAMS = push$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS)
++
++am_push_OBJECTS = push.$(OBJEXT)
++push_OBJECTS = $(am_push_OBJECTS)
++push_LDADD = $(LDADD)
++@KRB5_TRUE@push_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@push_DEPENDENCIES =
++push_LDFLAGS =
++SCRIPTS = $(bin_SCRIPTS)
++
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(push_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(push_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/push/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/push/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/push/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -426,8 +391,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -439,15 +404,16 @@
+ push$(EXEEXT): $(push_OBJECTS) $(push_DEPENDENCIES) 
+ 	@rm -f push$(EXEEXT)
+ 	$(LINK) $(push_LDFLAGS) $(push_OBJECTS) $(push_LDADD) $(LIBS)
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+ 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
++	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
++	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -455,24 +421,24 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -483,9 +449,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -504,8 +472,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -525,12 +493,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -549,8 +519,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -570,10 +540,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -582,7 +560,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -597,6 +574,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -619,9 +597,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -633,7 +615,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -655,10 +637,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -698,8 +679,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -742,18 +721,18 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libexecPROGRAMS clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binSCRIPTS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-libexecPROGRAMS \
+-	install-man install-man1 install-man8 install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binSCRIPTS \
+-	uninstall-info-am uninstall-libexecPROGRAMS uninstall-man \
+-	uninstall-man1 uninstall-man8
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binSCRIPTS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-man1 install-man8 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binSCRIPTS uninstall-info-am \
++	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
++	uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/rcp/Makefile.in heimdal-0.6.3/appl/rcp/Makefile.in
+--- heimdal-0.6.3-old/appl/rcp/Makefile.in	2004-09-13 22:29:02.000000000 +1000
++++ heimdal-0.6.3/appl/rcp/Makefile.in	2004-09-14 08:39:47.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(rcp_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,79 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-bin_PROGRAMS = rcp$(EXEEXT)
+-subdir = appl/rcp
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_rcp_OBJECTS = rcp.$(OBJEXT) util.$(OBJEXT)
+-rcp_OBJECTS = $(am_rcp_OBJECTS)
+-rcp_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-rcp_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(rcp_SOURCES)
+-DIST_SOURCES = $(rcp_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -140,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -150,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -173,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -191,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -199,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -247,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -327,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -335,71 +277,95 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = rcp
++
+ rcp_SOURCES = rcp.c util.c
++
+ LDADD = $(LIB_roken)
++subdir = appl/rcp
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = rcp$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_rcp_OBJECTS = rcp.$(OBJEXT) util.$(OBJEXT)
++rcp_OBJECTS = $(am_rcp_OBJECTS)
++rcp_LDADD = $(LDADD)
++rcp_DEPENDENCIES =
++rcp_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(rcp_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(rcp_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/rcp/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/rcp/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/rcp/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -407,8 +373,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -422,19 +388,19 @@
+ 	$(LINK) $(rcp_LDFLAGS) $(rcp_OBJECTS) $(rcp_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -446,6 +412,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -454,7 +428,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -469,6 +442,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -491,9 +465,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -505,7 +483,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -527,10 +505,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -568,8 +545,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -609,16 +584,15 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/rsh/Makefile.in heimdal-0.6.3/appl/rsh/Makefile.in
+--- heimdal-0.6.3-old/appl/rsh/Makefile.in	2004-09-13 22:29:03.000000000 +1000
++++ heimdal-0.6.3/appl/rsh/Makefile.in	2004-09-14 08:39:47.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(rsh_SOURCES) $(rshd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,98 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-bin_PROGRAMS = rsh$(EXEEXT)
+-libexec_PROGRAMS = rshd$(EXEEXT)
+-subdir = appl/rsh
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+-am_rsh_OBJECTS = rsh.$(OBJEXT) common.$(OBJEXT)
+-rsh_OBJECTS = $(am_rsh_OBJECTS)
+-rsh_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-@KRB5_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-@DCE_TRUE@am__DEPENDENCIES_4 = $(top_builddir)/lib/kdfs/libkdfs.la
+-rsh_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4)
+-am_rshd_OBJECTS = rshd.$(OBJEXT) common.$(OBJEXT) \
+-	login_access.$(OBJEXT)
+-rshd_OBJECTS = $(am_rshd_OBJECTS)
+-rshd_LDADD = $(LDADD)
+-rshd_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(rsh_SOURCES) $(rshd_SOURCES)
+-DIST_SOURCES = $(rsh_SOURCES) $(rshd_SOURCES)
+-man1dir = $(mandir)/man1
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -159,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -169,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -192,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -210,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -218,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -266,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -346,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -354,28 +277,50 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) -I$(srcdir)/../login
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = rsh
++
+ man_MANS = rsh.1 rshd.8
++
++libexec_PROGRAMS = rshd
++
+ rsh_SOURCES = rsh.c common.c rsh_locl.h
++
+ rshd_SOURCES = rshd.c common.c login_access.c rsh_locl.h
++
+ LDADD = $(LIB_kafs) \
+ 	$(LIB_krb5) \
+ 	$(LIB_krb4) \
+@@ -383,50 +328,89 @@
+ 	$(LIB_roken) \
+ 	$(LIB_kdfs)
+ 
++subdir = appl/rsh
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = rsh$(EXEEXT)
++libexec_PROGRAMS = rshd$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
++
++am_rsh_OBJECTS = rsh.$(OBJEXT) common.$(OBJEXT)
++rsh_OBJECTS = $(am_rsh_OBJECTS)
++rsh_LDADD = $(LDADD)
++@DCE_FALSE@@KRB5_TRUE@rsh_DEPENDENCIES = \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/kafs/libkafs.la \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@DCE_FALSE@@KRB5_FALSE@rsh_DEPENDENCIES = \
++@DCE_FALSE@@KRB5_FALSE@	$(top_builddir)/lib/kafs/libkafs.la
++@DCE_TRUE@@KRB5_TRUE@rsh_DEPENDENCIES = \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/kafs/libkafs.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/kdfs/libkdfs.la
++@DCE_TRUE@@KRB5_FALSE@rsh_DEPENDENCIES = \
++@DCE_TRUE@@KRB5_FALSE@	$(top_builddir)/lib/kafs/libkafs.la \
++@DCE_TRUE@@KRB5_FALSE@	$(top_builddir)/lib/kdfs/libkdfs.la
++rsh_LDFLAGS =
++am_rshd_OBJECTS = rshd.$(OBJEXT) common.$(OBJEXT) login_access.$(OBJEXT)
++rshd_OBJECTS = $(am_rshd_OBJECTS)
++rshd_LDADD = $(LDADD)
++@DCE_FALSE@@KRB5_TRUE@rshd_DEPENDENCIES = \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/kafs/libkafs.la \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@DCE_FALSE@@KRB5_FALSE@rshd_DEPENDENCIES = \
++@DCE_FALSE@@KRB5_FALSE@	$(top_builddir)/lib/kafs/libkafs.la
++@DCE_TRUE@@KRB5_TRUE@rshd_DEPENDENCIES = \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/kafs/libkafs.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/kdfs/libkdfs.la
++@DCE_TRUE@@KRB5_FALSE@rshd_DEPENDENCIES = \
++@DCE_TRUE@@KRB5_FALSE@	$(top_builddir)/lib/kafs/libkafs.la \
++@DCE_TRUE@@KRB5_FALSE@	$(top_builddir)/lib/kdfs/libkdfs.la
++rshd_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(rsh_SOURCES) $(rshd_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(rsh_SOURCES) $(rshd_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/rsh/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/rsh/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/rsh/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -434,8 +418,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -444,17 +428,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -462,8 +447,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -480,19 +465,19 @@
+ 	$(LINK) $(rshd_LDFLAGS) $(rshd_OBJECTS) $(rshd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -503,9 +488,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -524,8 +511,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -545,12 +532,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -569,8 +558,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -590,10 +579,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -602,7 +599,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -617,6 +613,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -639,9 +636,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -653,7 +654,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -675,10 +676,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -717,8 +717,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -763,17 +761,16 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am \
+-	install-libexecPROGRAMS install-man install-man1 install-man8 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
+-	uninstall-man8
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-libexecPROGRAMS \
++	install-man install-man1 install-man8 install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-libexecPROGRAMS uninstall-man \
++	uninstall-man1 uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/su/Makefile.in heimdal-0.6.3/appl/su/Makefile.in
+--- heimdal-0.6.3-old/appl/su/Makefile.in	2004-09-13 22:29:04.000000000 +1000
++++ heimdal-0.6.3/appl/su/Makefile.in	2004-09-14 08:39:47.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(su_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,84 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-bin_PROGRAMS = su$(EXEEXT)
+-subdir = appl/su
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_su_OBJECTS = su.$(OBJEXT)
+-su_OBJECTS = $(am_su_OBJECTS)
+-su_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-su_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+-	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(su_SOURCES)
+-DIST_SOURCES = $(su_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -145,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -155,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -178,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -196,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -204,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -252,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -332,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -340,27 +277,44 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = su
+ bin_SUIDS = su
+ su_SOURCES = su.c
++
+ LDADD = $(LIB_kafs) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_krb4) \
+@@ -368,50 +322,58 @@
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++subdir = appl/su
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = su$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_su_OBJECTS = su.$(OBJEXT)
++su_OBJECTS = $(am_su_OBJECTS)
++su_LDADD = $(LDADD)
++su_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++su_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(su_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(su_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/su/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/su/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/su/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -419,8 +381,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -434,19 +396,19 @@
+ 	$(LINK) $(su_LDFLAGS) $(su_OBJECTS) $(su_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -458,6 +420,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -466,7 +436,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -481,6 +450,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -503,9 +473,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -517,7 +491,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -539,10 +513,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -580,8 +553,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -621,16 +592,15 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/telnet/libtelnet/Makefile.in heimdal-0.6.3/appl/telnet/libtelnet/Makefile.in
+--- heimdal-0.6.3-old/appl/telnet/libtelnet/Makefile.in	2004-09-13 22:29:06.000000000 +1000
++++ heimdal-0.6.3/appl/telnet/libtelnet/Makefile.in	2004-09-14 08:39:48.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(libtelnet_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,78 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = appl/telnet/libtelnet
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-ARFLAGS = cru
+-LIBRARIES = $(noinst_LIBRARIES)
+-libtelnet_a_AR = $(AR) $(ARFLAGS)
+-libtelnet_a_LIBADD =
+-am_libtelnet_a_OBJECTS = auth.$(OBJEXT) enc_des.$(OBJEXT) \
+-	encrypt.$(OBJEXT) genget.$(OBJEXT) kerberos.$(OBJEXT) \
+-	kerberos5.$(OBJEXT) misc.$(OBJEXT)
+-libtelnet_a_OBJECTS = $(am_libtelnet_a_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libtelnet_a_SOURCES)
+-DIST_SOURCES = $(libtelnet_a_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -139,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -149,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -172,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -190,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -198,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -246,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -326,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -334,26 +277,42 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ noinst_LIBRARIES = libtelnet.a
++
+ libtelnet_a_SOURCES = \
+ 	auth-proto.h	\
+ 	auth.c		\
+@@ -369,40 +328,46 @@
+ 	misc.c		\
+ 	misc.h
+ 
++
+ EXTRA_DIST = krb4encpwd.c rsaencpwd.c spx.c
++subdir = appl/telnet/libtelnet
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(noinst_LIBRARIES)
++
++libtelnet_a_AR = $(AR) cru
++libtelnet_a_LIBADD =
++am_libtelnet_a_OBJECTS = auth.$(OBJEXT) enc_des.$(OBJEXT) \
++	encrypt.$(OBJEXT) genget.$(OBJEXT) kerberos.$(OBJEXT) \
++	kerberos5.$(OBJEXT) misc.$(OBJEXT)
++libtelnet_a_OBJECTS = $(am_libtelnet_a_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libtelnet_a_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(libtelnet_a_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/libtelnet/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/libtelnet/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/telnet/libtelnet/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+@@ -412,19 +377,19 @@
+ 	$(RANLIB) libtelnet.a
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -436,6 +401,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -444,7 +417,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -459,6 +431,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -481,9 +454,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -495,7 +472,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -517,6 +494,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LIBRARIES) all-local
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -556,8 +534,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -597,15 +573,14 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/telnet/Makefile.in heimdal-0.6.3/appl/telnet/Makefile.in
+--- heimdal-0.6.3-old/appl/telnet/Makefile.in	2004-09-13 22:29:05.000000000 +1000
++++ heimdal-0.6.3/appl/telnet/Makefile.in	2004-09-14 08:39:48.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,68 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-subdir = appl/telnet
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -126,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -136,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -159,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -177,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -185,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -233,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -313,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -321,60 +277,69 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ SUBDIRS = libtelnet telnet telnetd
++
+ EXTRA_DIST = README.ORIG telnet.state
++subdir = appl/telnet
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/telnet/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -445,6 +410,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -453,7 +426,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -479,6 +451,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -501,9 +474,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -515,7 +492,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -532,13 +509,13 @@
+ 	done
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -552,6 +529,7 @@
+ all-am: Makefile all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -589,8 +567,6 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -633,14 +609,18 @@
+ 	check-am check-local clean clean-generic clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++	info-recursive install install-am install-data install-data-am \
++	install-data-recursive install-exec install-exec-am \
++	install-exec-recursive install-info install-info-am \
++	install-info-recursive install-man install-recursive \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
++	tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/telnet/telnet/Makefile.in heimdal-0.6.3/appl/telnet/telnet/Makefile.in
+--- heimdal-0.6.3-old/appl/telnet/telnet/Makefile.in	2004-09-13 22:29:07.000000000 +1000
++++ heimdal-0.6.3/appl/telnet/telnet/Makefile.in	2004-09-14 08:39:49.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(telnet_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,90 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = telnet$(EXEEXT)
+-subdir = appl/telnet/telnet
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_telnet_OBJECTS = authenc.$(OBJEXT) commands.$(OBJEXT) \
+-	main.$(OBJEXT) network.$(OBJEXT) ring.$(OBJEXT) \
+-	sys_bsd.$(OBJEXT) telnet.$(OBJEXT) terminal.$(OBJEXT) \
+-	utilities.$(OBJEXT)
+-telnet_OBJECTS = $(am_telnet_OBJECTS)
+-telnet_LDADD = $(LDADD)
+-@KRB5_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-am__DEPENDENCIES_2 =
+-@DCE_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/lib/kdfs/libkdfs.la
+-telnet_DEPENDENCIES = ../libtelnet/libtelnet.a $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(telnet_SOURCES)
+-DIST_SOURCES = $(telnet_SOURCES)
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -151,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -161,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -184,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -202,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -210,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -258,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -338,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -346,31 +277,51 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = telnet
++
+ CHECK_LOCAL = 
++
+ telnet_SOURCES = authenc.c commands.c main.c network.c ring.c \
+ 		  sys_bsd.c telnet.c terminal.c \
+ 		  utilities.c defines.h externs.h ring.h telnet_locl.h types.h
+ 
++
+ man_MANS = telnet.1
++
+ LDADD = ../libtelnet/libtelnet.a \
+ 	$(LIB_krb5) \
+ 	$(LIB_krb4) \
+@@ -379,50 +330,68 @@
+ 	$(LIB_kdfs) \
+ 	$(LIB_roken)
+ 
++subdir = appl/telnet/telnet
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = telnet$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_telnet_OBJECTS = authenc.$(OBJEXT) commands.$(OBJEXT) main.$(OBJEXT) \
++	network.$(OBJEXT) ring.$(OBJEXT) sys_bsd.$(OBJEXT) \
++	telnet.$(OBJEXT) terminal.$(OBJEXT) utilities.$(OBJEXT)
++telnet_OBJECTS = $(am_telnet_OBJECTS)
++telnet_LDADD = $(LDADD)
++@DCE_FALSE@@KRB5_TRUE@telnet_DEPENDENCIES = ../libtelnet/libtelnet.a \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@DCE_FALSE@@KRB5_FALSE@telnet_DEPENDENCIES = ../libtelnet/libtelnet.a
++@DCE_TRUE@@KRB5_TRUE@telnet_DEPENDENCIES = ../libtelnet/libtelnet.a \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/kdfs/libkdfs.la
++@DCE_TRUE@@KRB5_FALSE@telnet_DEPENDENCIES = ../libtelnet/libtelnet.a \
++@DCE_TRUE@@KRB5_FALSE@	$(top_builddir)/lib/kdfs/libkdfs.la
++telnet_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(telnet_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(telnet_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/telnet/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/telnet/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/telnet/telnet/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -430,8 +399,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -445,19 +414,19 @@
+ 	$(LINK) $(telnet_LDFLAGS) $(telnet_OBJECTS) $(telnet_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -468,9 +437,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -489,8 +460,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -510,10 +481,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -522,7 +501,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -537,6 +515,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -559,9 +538,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -573,7 +556,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -595,10 +578,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -636,8 +618,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -679,17 +659,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-man1 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+-	uninstall-man1
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-man uninstall-man1
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/telnet/telnetd/Makefile.in heimdal-0.6.3/appl/telnet/telnetd/Makefile.in
+--- heimdal-0.6.3-old/appl/telnet/telnetd/Makefile.in	2004-09-13 22:29:08.000000000 +1000
++++ heimdal-0.6.3/appl/telnet/telnetd/Makefile.in	2004-09-14 08:39:49.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(telnetd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,90 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-libexec_PROGRAMS = telnetd$(EXEEXT)
+-subdir = appl/telnet/telnetd
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)"
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS)
+-am_telnetd_OBJECTS = telnetd.$(OBJEXT) state.$(OBJEXT) \
+-	termstat.$(OBJEXT) slc.$(OBJEXT) sys_term.$(OBJEXT) \
+-	utility.$(OBJEXT) global.$(OBJEXT) authenc.$(OBJEXT)
+-telnetd_OBJECTS = $(am_telnetd_OBJECTS)
+-telnetd_LDADD = $(LDADD)
+-@KRB5_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-am__DEPENDENCIES_2 =
+-@DCE_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/lib/kdfs/libkdfs.la
+-telnetd_DEPENDENCIES = ../libtelnet/libtelnet.a $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(telnetd_SOURCES)
+-DIST_SOURCES = $(telnetd_SOURCES)
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -151,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -161,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -184,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -202,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -210,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -258,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -338,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -346,30 +277,50 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++libexec_PROGRAMS = telnetd
++
+ CHECK_LOCAL = 
++
+ telnetd_SOURCES = telnetd.c state.c termstat.c slc.c sys_term.c \
+ 		   utility.c global.c authenc.c defs.h ext.h telnetd.h
+ 
++
+ man_MANS = telnetd.8
++
+ LDADD = \
+ 	../libtelnet/libtelnet.a \
+ 	$(LIB_krb5) \
+@@ -382,50 +333,68 @@
+ 	$(LIB_kdfs) \
+ 	$(LIB_roken)
+ 
++subdir = appl/telnet/telnetd
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++libexec_PROGRAMS = telnetd$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS)
++
++am_telnetd_OBJECTS = telnetd.$(OBJEXT) state.$(OBJEXT) \
++	termstat.$(OBJEXT) slc.$(OBJEXT) sys_term.$(OBJEXT) \
++	utility.$(OBJEXT) global.$(OBJEXT) authenc.$(OBJEXT)
++telnetd_OBJECTS = $(am_telnetd_OBJECTS)
++telnetd_LDADD = $(LDADD)
++@DCE_FALSE@@KRB5_TRUE@telnetd_DEPENDENCIES = ../libtelnet/libtelnet.a \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_FALSE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@DCE_FALSE@@KRB5_FALSE@telnetd_DEPENDENCIES = ../libtelnet/libtelnet.a
++@DCE_TRUE@@KRB5_TRUE@telnetd_DEPENDENCIES = ../libtelnet/libtelnet.a \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la \
++@DCE_TRUE@@KRB5_TRUE@	$(top_builddir)/lib/kdfs/libkdfs.la
++@DCE_TRUE@@KRB5_FALSE@telnetd_DEPENDENCIES = ../libtelnet/libtelnet.a \
++@DCE_TRUE@@KRB5_FALSE@	$(top_builddir)/lib/kdfs/libkdfs.la
++telnetd_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(telnetd_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(telnetd_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/telnetd/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/telnet/telnetd/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/telnet/telnetd/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -433,8 +402,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -448,19 +417,19 @@
+ 	$(LINK) $(telnetd_LDFLAGS) $(telnetd_OBJECTS) $(telnetd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -471,9 +440,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -492,8 +463,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -513,10 +484,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -525,7 +504,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -540,6 +518,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -562,9 +541,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -576,7 +559,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -598,10 +581,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -640,8 +622,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -677,24 +657,22 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
+-	uninstall-man
++uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS uninstall-man
+ 
+ uninstall-man: uninstall-man8
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libexecPROGRAMS clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libexecPROGRAMS install-man \
+-	install-man8 install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-info-am uninstall-libexecPROGRAMS \
+-	uninstall-man uninstall-man8
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-man8 install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am \
++	uninstall-libexecPROGRAMS uninstall-man uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/test/Makefile.in heimdal-0.6.3/appl/test/Makefile.in
+--- heimdal-0.6.3-old/appl/test/Makefile.in	2004-09-13 22:29:09.000000000 +1000
++++ heimdal-0.6.3/appl/test/Makefile.in	2004-09-14 08:39:50.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(gssapi_client_SOURCES) $(gssapi_server_SOURCES) $(nt_gss_client_SOURCES) $(nt_gss_server_SOURCES) $(tcp_client_SOURCES) $(tcp_server_SOURCES) $(uu_client_SOURCES) $(uu_server_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,129 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-noinst_PROGRAMS = tcp_client$(EXEEXT) tcp_server$(EXEEXT) \
+-	gssapi_server$(EXEEXT) gssapi_client$(EXEEXT) \
+-	uu_server$(EXEEXT) uu_client$(EXEEXT) nt_gss_server$(EXEEXT) \
+-	nt_gss_client$(EXEEXT)
+-subdir = appl/test
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-PROGRAMS = $(noinst_PROGRAMS)
+-am_gssapi_client_OBJECTS = gssapi_client.$(OBJEXT) \
+-	gss_common.$(OBJEXT) common.$(OBJEXT)
+-gssapi_client_OBJECTS = $(am_gssapi_client_OBJECTS)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am__DEPENDENCIES_3 = $(top_builddir)/lib/gssapi/libgssapi.la \
+-	$(am__DEPENDENCIES_2)
+-gssapi_client_DEPENDENCIES = $(am__DEPENDENCIES_3)
+-am_gssapi_server_OBJECTS = gssapi_server.$(OBJEXT) \
+-	gss_common.$(OBJEXT) common.$(OBJEXT)
+-gssapi_server_OBJECTS = $(am_gssapi_server_OBJECTS)
+-gssapi_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
+-	$(am__DEPENDENCIES_2)
+-am_nt_gss_client_OBJECTS = nt_gss_client.$(OBJEXT) \
+-	nt_gss_common.$(OBJEXT) common.$(OBJEXT)
+-nt_gss_client_OBJECTS = $(am_nt_gss_client_OBJECTS)
+-nt_gss_client_DEPENDENCIES = $(am__DEPENDENCIES_3)
+-am_nt_gss_server_OBJECTS = nt_gss_server.$(OBJEXT) \
+-	nt_gss_common.$(OBJEXT)
+-nt_gss_server_OBJECTS = $(am_nt_gss_server_OBJECTS)
+-am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
+-nt_gss_server_DEPENDENCIES = $(am__DEPENDENCIES_4)
+-am_tcp_client_OBJECTS = tcp_client.$(OBJEXT) common.$(OBJEXT)
+-tcp_client_OBJECTS = $(am_tcp_client_OBJECTS)
+-tcp_client_LDADD = $(LDADD)
+-tcp_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am_tcp_server_OBJECTS = tcp_server.$(OBJEXT) common.$(OBJEXT)
+-tcp_server_OBJECTS = $(am_tcp_server_OBJECTS)
+-tcp_server_LDADD = $(LDADD)
+-tcp_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am_uu_client_OBJECTS = uu_client.$(OBJEXT) common.$(OBJEXT)
+-uu_client_OBJECTS = $(am_uu_client_OBJECTS)
+-uu_client_LDADD = $(LDADD)
+-uu_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am_uu_server_OBJECTS = uu_server.$(OBJEXT) common.$(OBJEXT)
+-uu_server_OBJECTS = $(am_uu_server_OBJECTS)
+-uu_server_LDADD = $(LDADD)
+-uu_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(gssapi_client_SOURCES) $(gssapi_server_SOURCES) \
+-	$(nt_gss_client_SOURCES) $(nt_gss_server_SOURCES) \
+-	$(tcp_client_SOURCES) $(tcp_server_SOURCES) \
+-	$(uu_client_SOURCES) $(uu_server_SOURCES)
+-DIST_SOURCES = $(gssapi_client_SOURCES) $(gssapi_server_SOURCES) \
+-	$(nt_gss_client_SOURCES) $(nt_gss_server_SOURCES) \
+-	$(tcp_client_SOURCES) $(tcp_server_SOURCES) \
+-	$(uu_client_SOURCES) $(uu_server_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -190,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -200,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -223,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -241,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -249,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -297,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -377,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -385,79 +277,168 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++noinst_PROGRAMS = tcp_client tcp_server gssapi_server gssapi_client \
++	uu_server uu_client nt_gss_server nt_gss_client
++
++
+ tcp_client_SOURCES = tcp_client.c common.c test_locl.h
++
+ tcp_server_SOURCES = tcp_server.c common.c test_locl.h
++
+ gssapi_server_SOURCES = gssapi_server.c gss_common.c common.c \
+ 	gss_common.h test_locl.h
+ 
++
+ gssapi_client_SOURCES = gssapi_client.c gss_common.c common.c \
+ 	gss_common.h test_locl.h
+ 
++
+ uu_server_SOURCES = uu_server.c common.c test_locl.h
++
+ uu_client_SOURCES = uu_client.c common.c test_locl.h
++
+ gssapi_server_LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LDADD)
++
+ gssapi_client_LDADD = $(gssapi_server_LDADD)
++
+ nt_gss_client_SOURCES = nt_gss_client.c nt_gss_common.c common.c
++
+ nt_gss_server_SOURCES = nt_gss_server.c nt_gss_common.c
++
+ nt_gss_client_LDADD = $(gssapi_server_LDADD)
++
+ nt_gss_server_LDADD = $(nt_gss_client_LDADD)
++
+ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++subdir = appl/test
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++noinst_PROGRAMS = tcp_client$(EXEEXT) tcp_server$(EXEEXT) \
++	gssapi_server$(EXEEXT) gssapi_client$(EXEEXT) \
++	uu_server$(EXEEXT) uu_client$(EXEEXT) nt_gss_server$(EXEEXT) \
++	nt_gss_client$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++am_gssapi_client_OBJECTS = gssapi_client.$(OBJEXT) gss_common.$(OBJEXT) \
++	common.$(OBJEXT)
++gssapi_client_OBJECTS = $(am_gssapi_client_OBJECTS)
++gssapi_client_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++gssapi_client_LDFLAGS =
++am_gssapi_server_OBJECTS = gssapi_server.$(OBJEXT) gss_common.$(OBJEXT) \
++	common.$(OBJEXT)
++gssapi_server_OBJECTS = $(am_gssapi_server_OBJECTS)
++gssapi_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++gssapi_server_LDFLAGS =
++am_nt_gss_client_OBJECTS = nt_gss_client.$(OBJEXT) \
++	nt_gss_common.$(OBJEXT) common.$(OBJEXT)
++nt_gss_client_OBJECTS = $(am_nt_gss_client_OBJECTS)
++nt_gss_client_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++nt_gss_client_LDFLAGS =
++am_nt_gss_server_OBJECTS = nt_gss_server.$(OBJEXT) \
++	nt_gss_common.$(OBJEXT)
++nt_gss_server_OBJECTS = $(am_nt_gss_server_OBJECTS)
++nt_gss_server_DEPENDENCIES = $(top_builddir)/lib/gssapi/libgssapi.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++nt_gss_server_LDFLAGS =
++am_tcp_client_OBJECTS = tcp_client.$(OBJEXT) common.$(OBJEXT)
++tcp_client_OBJECTS = $(am_tcp_client_OBJECTS)
++tcp_client_LDADD = $(LDADD)
++tcp_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++tcp_client_LDFLAGS =
++am_tcp_server_OBJECTS = tcp_server.$(OBJEXT) common.$(OBJEXT)
++tcp_server_OBJECTS = $(am_tcp_server_OBJECTS)
++tcp_server_LDADD = $(LDADD)
++tcp_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++tcp_server_LDFLAGS =
++am_uu_client_OBJECTS = uu_client.$(OBJEXT) common.$(OBJEXT)
++uu_client_OBJECTS = $(am_uu_client_OBJECTS)
++uu_client_LDADD = $(LDADD)
++uu_client_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++uu_client_LDFLAGS =
++am_uu_server_OBJECTS = uu_server.$(OBJEXT) common.$(OBJEXT)
++uu_server_OBJECTS = $(am_uu_server_OBJECTS)
++uu_server_LDADD = $(LDADD)
++uu_server_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++uu_server_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(gssapi_client_SOURCES) $(gssapi_server_SOURCES) \
++	$(nt_gss_client_SOURCES) $(nt_gss_server_SOURCES) \
++	$(tcp_client_SOURCES) $(tcp_server_SOURCES) \
++	$(uu_client_SOURCES) $(uu_server_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(gssapi_client_SOURCES) $(gssapi_server_SOURCES) $(nt_gss_client_SOURCES) $(nt_gss_server_SOURCES) $(tcp_client_SOURCES) $(tcp_server_SOURCES) $(uu_client_SOURCES) $(uu_server_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/test/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/test/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/test/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ clean-noinstPROGRAMS:
+ 	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+@@ -491,19 +472,19 @@
+ 	$(LINK) $(uu_server_LDFLAGS) $(uu_server_OBJECTS) $(uu_server_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -515,6 +496,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -523,7 +512,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -538,6 +526,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -560,9 +549,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -574,7 +567,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -596,6 +589,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) all-local
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -635,8 +629,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -676,15 +668,14 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libtool clean-noinstPROGRAMS ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/appl/xnlock/Makefile.in heimdal-0.6.3/appl/xnlock/Makefile.in
+--- heimdal-0.6.3-old/appl/xnlock/Makefile.in	2004-09-13 22:29:10.000000000 +1000
++++ heimdal-0.6.3/appl/xnlock/Makefile.in	2004-09-14 08:39:50.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = xnlock.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,88 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-@HAVE_X_TRUE@bin_PROGRAMS = xnlock$(EXEEXT)
+-subdir = appl/xnlock
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-xnlock_SOURCES = xnlock.c
+-xnlock_OBJECTS = xnlock.$(OBJEXT)
+-xnlock_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-@KRB5_TRUE@am__DEPENDENCIES_3 = $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+-xnlock_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = xnlock.c
+-DIST_SOURCES = xnlock.c
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -149,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -159,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -182,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -200,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -208,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -256,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -284,6 +218,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
++
+ WFLAGS = @WFLAGS@ $(WFLAGS_NOIMPLICITINT)
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+ WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
+@@ -336,7 +271,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -344,30 +278,52 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(X_CFLAGS)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++@HAVE_X_FALSE@bin_PROGRAMS = 
++
++@HAVE_X_TRUE@bin_PROGRAMS = xnlock
++
+ CHECK_LOCAL = 
++
+ man_MANS = xnlock.1
++
+ EXTRA_DIST = $(man_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \
+ 	nose.down nose.front nose.left.front nose.right.front
+ 
++
+ LDADD = \
+ 	$(LIB_kafs) \
+ 	$(LIB_krb5) \
+@@ -376,50 +332,62 @@
+ 	$(LIB_roken) \
+ 	$(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
+ 
++subdir = appl/xnlock
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++@HAVE_X_TRUE@bin_PROGRAMS = xnlock$(EXEEXT)
++@HAVE_X_FALSE@bin_PROGRAMS =
++PROGRAMS = $(bin_PROGRAMS)
++
++xnlock_SOURCES = xnlock.c
++xnlock_OBJECTS = xnlock.$(OBJEXT)
++xnlock_LDADD = $(LDADD)
++@KRB5_TRUE@xnlock_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++@KRB5_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_FALSE@xnlock_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la
++xnlock_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = xnlock.c
++MANS = $(man_MANS)
++DIST_COMMON = README $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = xnlock.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps appl/xnlock/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps appl/xnlock/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  appl/xnlock/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -427,8 +395,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -442,19 +410,19 @@
+ 	$(LINK) $(xnlock_LDFLAGS) $(xnlock_OBJECTS) $(xnlock_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -465,9 +433,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -486,8 +456,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -507,10 +477,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -519,7 +497,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -534,6 +511,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -556,9 +534,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -570,7 +552,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -592,10 +574,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -633,8 +614,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -676,17 +655,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-binPROGRAMS clean-generic clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-man1 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+-	uninstall-man1
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am uninstall-man uninstall-man1
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/autom4te.cache/output.0 heimdal-0.6.3/autom4te.cache/output.0
+--- heimdal-0.6.3-old/autom4te.cache/output.0	1970-01-01 10:00:00.000000000 +1000
++++ heimdal-0.6.3/autom4te.cache/output.0	2004-09-14 08:39:13.000000000 +1000
+@@ -0,0 +1,55683 @@
++@%:@! /bin/sh
++@%:@ From configure.in Revision: 1.331.2.8 .
++@%:@ Guess values for system-dependent variables and create Makefiles.
++@%:@ Generated by GNU Autoconf 2.59 for Heimdal 0.6.3.
++@%:@
++@%:@ Report bugs to <heimdal-bugs@pdc.kth.se>.
++@%:@ 
++@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
++@%:@ This configure script is free software; the Free Software Foundation
++@%:@ gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++
++
++tagnames=${tagnames+${tagnames},}CXX
++
++tagnames=${tagnames+${tagnames},}F77
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME='Heimdal'
++PACKAGE_TARNAME='heimdal'
++PACKAGE_VERSION='0.6.3'
++PACKAGE_STRING='Heimdal 0.6.3'
++PACKAGE_BUGREPORT='heimdal-bugs@pdc.kth.se'
++
++ac_unique_file="kuser/kinit.c"
++ac_default_prefix=/usr/heimdal
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
++# include <unistd.h>
++#endif"
++
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CANONICAL_HOST YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT DIR_openldap INCLUDE_openldap LIB_openldap DIR_krb4 INCLUDE_krb4 LIB_krb4 EXTRA_LIB45 LIB_krb_enable_debug LIB_krb_disable_debug LIB_krb_get_our_ip_for_realm LIB_krb_kdctimeofday LIB_krb_get_kdc_time_diff KRB4_TRUE KRB4_FALSE KRB5_TRUE KRB5_FALSE do_roken_rename_TRUE do_roken_rename_FALSE LIB_kdb HAVE_OPENSSL_TRUE HAVE_OPENSSL_FALSE DIR_des INCLUDE_des LIB_des LIB_des_a LIB_des_so LIB_des_appl DCE_TRUE DCE_FALSE dpagaix_cflags dpagaix_ldadd dpagaix_ldflags LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM LIB_crypt LIB_roken DIR_roken CPPFLAGS_roken VOID_RETSIGTYPE have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIB@&t@OBJS have_glob_h_TRUE have_glob_h_FALSE LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror OTP_TRUE OTP_FALSE LIB_security NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT DIR_readline INCLUDE_readline LIB_readline DIR_hesiod INCLUDE_hesiod LIB_hesiod DIR_sl INCLUDE_sl LIB_sl DIR_ss INCLUDE_ss LIB_ss DIR_otp INCLUDE_otp LIB_otp AIX_TRUE AIX_FALSE AIX4_TRUE AIX4_FALSE LIB_dlopen HAVE_DLOPEN_TRUE HAVE_DLOPEN_FALSE LIB_loadquery AIX_DYNAMIC_AFS_TRUE AIX_DYNAMIC_AFS_FALSE AIX_EXTRA_KAFS IRIX_TRUE IRIX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X_TRUE HAVE_X_FALSE LIB_XauWriteAuth LIB_XauReadAuth LIB_XauFileName NEED_WRITEAUTH_TRUE NEED_WRITEAUTH_FALSE LIB_logwtmp LIB_logout LIB_openpty LIB_tgetent LIB_getpwnam_r LIB_el_init el_compat_TRUE el_compat_FALSE COMPILE_ET DIR_com_err LIB_com_err LIB_com_err_a LIB_com_err_so LIB_AUTH_SUBDIRS LTLIBOBJS'
++ac_subst_files=''
++
++# Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++cache_file=/dev/null
++exec_prefix=NONE
++no_create=
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++verbose=
++x_includes=NONE
++x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# and all the variables that are supposed to be based on exec_prefix
++# by default will actually change.
++# Use braces instead of parens because sh, perl, etc. also accept them.
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++ac_prev=
++for ac_option
++do
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case $ac_option in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir=$ac_optarg ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build_alias ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build_alias=$ac_optarg ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file=$ac_optarg ;;
++
++  --config-cache | -C)
++    cache_file=config.cache ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir=$ac_optarg ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    eval "enable_$ac_feature=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_$ac_feature='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix=$ac_optarg ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he | -h)
++    ac_init_help=long ;;
++  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++    ac_init_help=recursive ;;
++  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++    ac_init_help=short ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host_alias ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host_alias=$ac_optarg ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir=$ac_optarg ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir=$ac_optarg ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir=$ac_optarg ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir=$ac_optarg ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir=$ac_optarg ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir=$ac_optarg ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c | -n)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir=$ac_optarg ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix=$ac_optarg ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix=$ac_optarg ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix=$ac_optarg ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name=$ac_optarg ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir=$ac_optarg ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir=$ac_optarg ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site=$ac_optarg ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir=$ac_optarg ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir=$ac_optarg ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target_alias ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target_alias=$ac_optarg ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers | -V)
++    ac_init_version=: ;;
++
++  -with-* | --with-*)
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_$ac_package='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    eval "with_$ac_package=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes=$ac_optarg ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries=$ac_optarg ;;
++
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; }
++    ;;
++
++  *=*)
++    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++   { (exit 1); exit 1; }; }
++    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
++    eval "$ac_envvar='$ac_optarg'"
++    export $ac_envvar ;;
++
++  *)
++    # FIXME: should be removed in autoconf 3.0.
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++  { echo "$as_me: error: missing argument to $ac_option" >&2
++   { (exit 1); exit 1; }; }
++fi
++
++# Be sure to have absolute paths.
++for ac_var in exec_prefix prefix
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# Be sure to have absolute paths.
++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++	      localstatedir libdir includedir oldincludedir infodir mandir
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++  if test "x$build_alias" = x; then
++    cross_compiling=maybe
++    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used." >&2
++  elif test "x$build_alias" != "x$host_alias"; then
++    cross_compiling=yes
++  fi
++fi
++
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
++
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$0" : 'X\(//\)[^/]' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$0" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++   { (exit 1); exit 1; }; }
++  else
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++  fi
++fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++ac_env_CPP_set=${CPP+set}
++ac_env_CPP_value=$CPP
++ac_cv_env_CPP_set=${CPP+set}
++ac_cv_env_CPP_value=$CPP
++ac_env_CXX_set=${CXX+set}
++ac_env_CXX_value=$CXX
++ac_cv_env_CXX_set=${CXX+set}
++ac_cv_env_CXX_value=$CXX
++ac_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_env_CXXFLAGS_value=$CXXFLAGS
++ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_cv_env_CXXFLAGS_value=$CXXFLAGS
++ac_env_CXXCPP_set=${CXXCPP+set}
++ac_env_CXXCPP_value=$CXXCPP
++ac_cv_env_CXXCPP_set=${CXXCPP+set}
++ac_cv_env_CXXCPP_value=$CXXCPP
++ac_env_F77_set=${F77+set}
++ac_env_F77_value=$F77
++ac_cv_env_F77_set=${F77+set}
++ac_cv_env_F77_value=$F77
++ac_env_FFLAGS_set=${FFLAGS+set}
++ac_env_FFLAGS_value=$FFLAGS
++ac_cv_env_FFLAGS_set=${FFLAGS+set}
++ac_cv_env_FFLAGS_value=$FFLAGS
++
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++  # Omit some internal or obsolete options to make the list less imposing.
++  # This message is too long to be a string in the A/UX 3.1 sh.
++  cat <<_ACEOF
++\`configure' configures Heimdal 0.6.3 to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE.  See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++  -h, --help              display this help and exit
++      --help=short        display options specific to this package
++      --help=recursive    display the short help of all the included packages
++  -V, --version           display version information and exit
++  -q, --quiet, --silent   do not print \`checking...' messages
++      --cache-file=FILE   cache test results in FILE [disabled]
++  -C, --config-cache      alias for \`--cache-file=config.cache'
++  -n, --no-create         do not create output files
++      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
++
++_ACEOF
++
++  cat <<_ACEOF
++Installation directories:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++			  [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++			  [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++for instance \`--prefix=\$HOME'.
++
++For better control, use the options below.
++
++Fine tuning of the installation directories:
++  --bindir=DIR           user executables [EPREFIX/bin]
++  --sbindir=DIR          system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR       program executables [EPREFIX/libexec]
++  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
++  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
++  --libdir=DIR           object code libraries [EPREFIX/lib]
++  --includedir=DIR       C header files [PREFIX/include]
++  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
++  --infodir=DIR          info documentation [PREFIX/info]
++  --mandir=DIR           man documentation [PREFIX/man]
++_ACEOF
++
++  cat <<\_ACEOF
++
++Program names:
++  --program-prefix=PREFIX            prepend PREFIX to installed program names
++  --program-suffix=SUFFIX            append SUFFIX to installed program names
++  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
++
++X features:
++  --x-includes=DIR    X include files are in DIR
++  --x-libraries=DIR   X library files are in DIR
++
++System types:
++  --build=BUILD     configure for building on BUILD [guessed]
++  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++  case $ac_init_help in
++     short | recursive ) echo "Configuration of Heimdal 0.6.3:";;
++   esac
++  cat <<\_ACEOF
++
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer
++  --disable-largefile     omit support for large files
++  --enable-shared@<:@=PKGS@:>@ 
++                          build shared libraries @<:@default=no@:>@
++  --enable-static@<:@=PKGS@:>@ 
++                          build static libraries @<:@default=yes@:>@
++  --enable-fast-install@<:@=PKGS@:>@ 
++                          optimize for fast installation @<:@default=yes@:>@
++  --disable-libtool-lock  avoid locking (might break parallel builds)
++  --enable-dce            if you want support for DCE/DFS PAG's
++  --disable-berkeley-db   if you don't want berkeley db
++  --disable-otp           if you don't want OTP support
++  --enable-osfc2          enable some OSF C2 support
++  --disable-mmap          disable use of mmap
++  --enable-bigendian      the target is big endian
++  --enable-littleendian   the target is little endian
++  --disable-dynamic-afs   do not use loaded AFS library with AIX
++  --enable-netinfo        enable netinfo for configuration lookup
++
++Optional Packages:
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-mips-abi=abi     ABI to use for IRIX (32, n32, or 64)
++  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
++  --with-pic              try to use only PIC/non-PIC objects @<:@default=use
++                          both@:>@
++  --with-tags@<:@=TAGS@:>@ 
++                          include additional configurations @<:@automatic@:>@
++  --with-openldap=dir     use openldap in dir
++  --with-openldap-lib=dir use openldap libraries in dir
++  --with-openldap-include=dir 
++                          use openldap headers in dir
++  --with-openldap-config=path 
++                          config program for openldap
++  --with-krb4=dir         use krb4 in dir
++  --with-krb4-lib=dir     use krb4 libraries in dir
++  --with-krb4-include=dir use krb4 headers in dir
++  --with-krb4-config=path config program for krb4
++  --with-openssl=dir      use openssl in dir
++  --with-openssl-lib=dir  use openssl libraries in dir
++  --with-openssl-include=dir 
++                          use openssl headers in dir
++  --with-roken=dir        use the roken library in dir
++  --without-ipv6          do not enable IPv6 support
++  --with-readline=dir     use readline in dir
++  --with-readline-lib=dir use readline libraries in dir
++  --with-readline-include=dir 
++                          use readline headers in dir
++  --with-readline-config=path 
++                          config program for readline
++  --with-hesiod=dir       use hesiod in dir
++  --with-hesiod-lib=dir   use hesiod libraries in dir
++  --with-hesiod-include=dir 
++                          use hesiod headers in dir
++  --with-hesiod-config=path 
++                          config program for hesiod
++  --with-sl=dir           use sl in dir
++  --with-sl-lib=dir       use sl libraries in dir
++  --with-sl-include=dir   use sl headers in dir
++  --with-sl-config=path   config program for sl
++  --with-ss=dir           use ss in dir
++  --with-ss-lib=dir       use ss libraries in dir
++  --with-ss-include=dir   use ss headers in dir
++  --with-ss-config=path   config program for ss
++  --with-otp=dir          use otp in dir
++  --with-otp-lib=dir      use otp libraries in dir
++  --with-otp-include=dir  use otp headers in dir
++  --with-otp-config=path  config program for otp
++  --with-x                use the X Window System
++
++Some influential environment variables:
++  CC          C compiler command
++  CFLAGS      C compiler flags
++  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
++              nonstandard directory <lib dir>
++  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
++              headers in a nonstandard directory <include dir>
++  CPP         C preprocessor
++  CXX         C++ compiler command
++  CXXFLAGS    C++ compiler flags
++  CXXCPP      C++ preprocessor
++  F77         Fortran 77 compiler command
++  FFLAGS      Fortran 77 compiler flags
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++Report bugs to <heimdal-bugs@pdc.kth.se>.
++_ACEOF
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  ac_popdir=`pwd`
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++    cd $ac_dir
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_srcdir/configure; then
++      echo
++      $SHELL $ac_srcdir/configure  --help=recursive
++    elif test -f $ac_srcdir/configure.ac ||
++	   test -f $ac_srcdir/configure.in; then
++      echo
++      $ac_configure --help
++    else
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi
++    cd "$ac_popdir"
++  done
++fi
++
++test -n "$ac_init_help" && exit 0
++if $ac_init_version; then
++  cat <<\_ACEOF
++Heimdal configure 0.6.3
++generated by GNU Autoconf 2.59
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit 0
++fi
++exec 5>config.log
++cat >&5 <<_ACEOF
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by Heimdal $as_me 0.6.3, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++{
++cat <<_ASUNAME
++@%:@@%:@ --------- @%:@@%:@
++@%:@@%:@ Platform. @%:@@%:@
++@%:@@%:@ --------- @%:@@%:@
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ Core tests. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_sep=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log.  We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Be sure not to use single quotes in there, as some shells,
++# such as our DU 5.0 friend, will then `close' the trap.
++trap 'exit_status=$?
++  # Save into config.log some information that might help in debugging.
++  {
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ---------------- @%:@@%:@
++@%:@@%:@ Cache variables. @%:@@%:@
++@%:@@%:@ ---------------- @%:@@%:@
++_ASBOX
++    echo
++    # The following way of writing the cache mishandles newlines in values,
++{
++  (set) 2>&1 |
++    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      sed -n \
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++      ;;
++    *)
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++}
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ----------------- @%:@@%:@
++@%:@@%:@ Output variables. @%:@@%:@
++@%:@@%:@ ----------------- @%:@@%:@
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++@%:@@%:@ ------------- @%:@@%:@
++@%:@@%:@ Output files. @%:@@%:@
++@%:@@%:@ ------------- @%:@@%:@
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
++    if test -s confdefs.h; then
++      cat <<\_ASBOX
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ confdefs.h. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++_ASBOX
++      echo
++      sed "/^$/d" confdefs.h | sort
++      echo
++    fi
++    test "$ac_signal" != 0 &&
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
++  } >&5
++  rm -f core *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++    exit $exit_status
++     ' 0
++for ac_signal in 1 2 13 15; do
++  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo >confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++echo "$as_me: loading site script $ac_site_file" >&6;}
++    sed 's/^/| /' "$ac_site_file" >&5
++    . "$ac_site_file"
++  fi
++done
++
++if test -r "$cache_file"; then
++  # Some versions of bash will fail to source /dev/null (special
++  # files actually), so we avoid doing that.
++  if test -f "$cache_file"; then
++    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
++echo "$as_me: loading cache $cache_file" >&6;}
++    case $cache_file in
++      [\\/]* | ?:[\\/]* ) . $cache_file;;
++      *)                      . ./$cache_file;;
++    esac
++  fi
++else
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
++  >$cache_file
++fi
++
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++for ac_var in `(set) 2>&1 |
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,set)
++      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      ac_cache_corrupted=: ;;
++    ,);;
++    *)
++      if test "x$ac_old_val" != "x$ac_new_val"; then
++	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
++echo "$as_me:   former value:  $ac_old_val" >&2;}
++	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
++echo "$as_me:   current value: $ac_new_val" >&2;}
++	ac_cache_corrupted=:
++      fi;;
++  esac
++  # Pass precious variables to config.status.
++  if test "$ac_new_set" = set; then
++    case $ac_new_val in
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++    esac
++  fi
++done
++if $ac_cache_corrupted; then
++  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
++    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi; 
++  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++  
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++  
++
++
++          ac_config_headers="$ac_config_headers include/config.h"
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $@%:@ != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
++  (eval $ac_link_default) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Find the output, starting from the most likely.  This scheme is
++# not robust to junk in `.', hence go to wildcards (a.*) only as a last
++# resort.
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6
++
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./$ac_file'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++  fi
++fi
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # If both `conftest.exe' and `conftest' are `present' (well, observable)
++# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  export ac_cv_exeext
++	  break;;
++    * ) break;;
++  esac
++done
++else
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6
++
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cc_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std1 is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std1.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++# Some people use a C++ compiler to compile C.  Since we use `exit',
++# in C++ we need to declare it.  In case someone uses the same compiler
++# for both compiling C and C++ we need to have the C++ compiler decide
++# the declaration of exit, since it's the most demanding environment.
++cat >conftest.$ac_ext <<_ACEOF
++@%:@ifndef __cplusplus
++  choke me
++@%:@endif
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++  
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++am__api_version="1.7"
++ac_aux_dir=
++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f $ac_dir/shtool; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
++echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"
++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# Find a good install program.  We prefer a C program (faster),
++# so one script is as good as another.  But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# OS/2's system install, which has a completely different semantic
++# ./install, which can be erroneously created by make from ./install.sh.
++echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++if test -z "$INSTALL"; then
++if test "${ac_cv_path_install+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++  ./ | .// | /cC/* | \
++  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  /usr/ucb/* ) ;;
++  *)
++    # OSF1 and SCO ODT 3.0 have their own names for install.
++    # Don't use installbsd from OSF since it installs stuff as root
++    # by default.
++    for ac_prog in ginstall scoinst install; do
++      for ac_exec_ext in '' $ac_executable_extensions; do
++	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	  if test $ac_prog = install &&
++	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
++	  fi
++	fi
++      done
++    done
++    ;;
++esac
++done
++
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL=$ac_cv_path_install
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL=$ac_install_sh
++  fi
++fi
++echo "$as_me:$LINENO: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" >&5
++echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" >&2;}
++   { (exit 1); exit 1; }; }
++   fi
++
++   test "$2" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++Check your system clock" >&5
++echo "$as_me: error: newly created file is older than distributed files!
++Check your system clock" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++test "$program_prefix" != NONE &&
++  program_transform_name="s,^,$program_prefix,;$program_transform_name"
++# Use a double $ so make ignores it.
++test "$program_suffix" != NONE &&
++  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
++# Double any \ or $.  echo might interpret backslashes.
++# By default was `s,x,x', remove it if useless.
++cat <<\_ACEOF >conftest.sed
++s/[\\$]/&&/g;s/;s,x,x,$//
++_ACEOF
++program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
++rm conftest.sed
++
++
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
++echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++fi
++
++for ac_prog in gawk mawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AWK+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AWK="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.make <<\_ACEOF
++all:
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftest.make
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  SET_MAKE=
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++
++ # test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++   test -f $srcdir/config.status; then
++  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++
++
++# Define the identity of the package.
++ PACKAGE='heimdal'
++ VERSION='0.6.3'
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE "$PACKAGE"
++_ACEOF
++
++ 
++cat >>confdefs.h <<_ACEOF
++@%:@define VERSION "$VERSION"
++_ACEOF
++
++# Some tools Automake needs.
++
++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
++
++
++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
++
++
++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
++
++
++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
++
++
++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
++
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++
++
++
++echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
++    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi; 
++  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++  
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++  
++
++
++
++
++test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
++test "$localstatedir" = '${prefix}/var' && localstatedir='/var/heimdal'
++
++# Make sure we can run config.sub.
++$ac_config_sub sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
++echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++   { (exit 1); exit 1; }; }
++
++echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6
++if test "${ac_cv_build+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_build_alias=$build_alias
++test -z "$ac_cv_build_alias" &&
++  ac_cv_build_alias=`$ac_config_guess`
++test -z "$ac_cv_build_alias" &&
++  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++   { (exit 1); exit 1; }; }
++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6
++build=$ac_cv_build
++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_host_alias=$host_alias
++test -z "$ac_cv_host_alias" &&
++  ac_cv_host_alias=$ac_cv_build_alias
++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6
++host=$ac_cv_host
++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++CANONICAL_HOST=$host
++
++
++
++# Check whether --enable-largefile or --disable-largefile was given.
++if test "${enable_largefile+set}" = set; then
++  enableval="$enable_largefile"
++  
++fi; 
++if test "$enable_largefile" != no; then
++
++  echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
++if test "${ac_cv_sys_largefile_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_sys_largefile_CC=no
++     if test "$GCC" != yes; then
++       ac_save_CC=$CC
++       while :; do
++     	 # IRIX 6.2 and later do not support large files by default,
++     	 # so use the C compiler's -n32 option if that helps.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++     	 rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++     	 CC="$CC -n32"
++     	 rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sys_largefile_CC=' -n32'; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++	 break
++       done
++       CC=$ac_save_CC
++       rm -f conftest.$ac_ext
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
++  if test "$ac_cv_sys_largefile_CC" != no; then
++    CC=$CC$ac_cv_sys_largefile_CC
++  fi
++
++  echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
++if test "${ac_cv_sys_file_offset_bits+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  while :; do
++  ac_cv_sys_file_offset_bits=no
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@define _FILE_OFFSET_BITS 64
++@%:@include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sys_file_offset_bits=64; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  break
++done
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
++if test "$ac_cv_sys_file_offset_bits" != no; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
++_ACEOF
++
++fi
++rm -f conftest*
++  echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
++if test "${ac_cv_sys_large_files+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  while :; do
++  ac_cv_sys_large_files=no
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@define _LARGE_FILES 1
++@%:@include <sys/types.h>
++ /* Check that off_t can represent 2**63 - 1 correctly.
++    We can't simply define LARGE_OFF_T to be 9223372036854775807,
++    since some C++ compilers masquerading as C compilers
++    incorrectly reject 9223372036854775807.  */
++@%:@define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++		       && LARGE_OFF_T % 2147483647 == 1)
++		      ? 1 : -1];
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sys_large_files=1; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  break
++done
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
++echo "${ECHO_T}$ac_cv_sys_large_files" >&6
++if test "$ac_cv_sys_large_files" != no; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define _LARGE_FILES $ac_cv_sys_large_files
++_ACEOF
++
++fi
++rm -f conftest*
++fi
++
++if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
++	CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
++fi
++
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define _GNU_SOURCE 1
++_ACEOF
++
++
++
++
++
++for ac_prog in 'bison -y' byacc
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_YACC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$YACC"; then
++  ac_cv_prog_YACC="$YACC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_YACC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++YACC=$ac_cv_prog_YACC
++if test -n "$YACC"; then
++  echo "$as_me:$LINENO: result: $YACC" >&5
++echo "${ECHO_T}$YACC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$YACC" && break
++done
++test -n "$YACC" || YACC="yacc"
++
++for ac_prog in flex lex
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_LEX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$LEX"; then
++  ac_cv_prog_LEX="$LEX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_LEX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  echo "$as_me:$LINENO: result: $LEX" >&5
++echo "${ECHO_T}$LEX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
++if test -z "$LEXLIB"
++then
++  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_fl_yywrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_fl_yywrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
++if test $ac_cv_lib_fl_yywrap = yes; then
++  LEXLIB="-lfl"
++else
++  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_l_yywrap=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_l_yywrap=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
++if test $ac_cv_lib_l_yywrap = yes; then
++  LEXLIB="-ll"
++fi
++
++fi
++
++fi
++
++if test "x$LEX" != "x:"; then
++  echo "$as_me:$LINENO: checking lex output file root" >&5
++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_root+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # The minimal lex program is just a single line: %%.  But some broken lexes
++# (Solaris, I think it was) want two %% lines, so accommodate them.
++cat >conftest.l <<_ACEOF
++%%
++%%
++_ACEOF
++{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
++  (eval $LEX conftest.l) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++if test -f lex.yy.c; then
++  ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++  ac_cv_prog_lex_root=lexyy
++else
++  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
++echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
++rm -f conftest.l
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
++echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # POSIX says lex can declare yytext either as a pointer or an array; the
++# default is implementation-dependent. Figure out which it is, since
++# not all implementations provide the %pointer and %array declarations.
++ac_cv_prog_lex_yytext_pointer=no
++echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
++ac_save_LIBS=$LIBS
++LIBS="$LIBS $LEXLIB"
++cat >conftest.$ac_ext <<_ACEOF
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_lex_yytext_pointer=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
++rm -f "${LEX_OUTPUT_ROOT}.c"
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define YYTEXT_POINTER 1
++_ACEOF
++
++fi
++
++fi
++if test "$LEX" = :; then
++  LEX=${am_missing_run}flex
++fi
++for ac_prog in gawk mawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AWK+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AWK="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "$as_me:$LINENO: checking for ln -s or something else" >&5
++echo $ECHO_N "checking for ln -s or something else... $ECHO_C" >&6
++if test "${ac_cv_prog_LN_S+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f conftestdata
++if ln -s X conftestdata 2>/dev/null
++then
++  rm -f conftestdata
++  ac_cv_prog_LN_S="ln -s"
++else
++  touch conftestdata1
++  if ln conftestdata1 conftestdata2; then
++    rm -f conftestdata*
++    ac_cv_prog_LN_S=ln
++  else
++    ac_cv_prog_LN_S=cp
++  fi
++fi
++fi
++LN_S="$ac_cv_prog_LN_S"
++echo "$as_me:$LINENO: result: $ac_cv_prog_LN_S" >&5
++echo "${ECHO_T}$ac_cv_prog_LN_S" >&6
++
++
++
++
++# Check whether --with-mips_abi or --without-mips_abi was given.
++if test "${with_mips_abi+set}" = set; then
++  withval="$with_mips_abi"
++  
++fi; 
++
++case "$host_os" in
++irix*)
++with_mips_abi="${with_mips_abi:-yes}"
++if test -n "$GCC"; then
++
++# GCC < 2.8 only supports the O32 ABI. GCC >= 2.8 has a flag to select
++# which ABI to use, but only supports (as of 2.8.1) the N32 and 64 ABIs.
++#
++# Default to N32, but if GCC doesn't grok -mabi=n32, we assume an old
++# GCC and revert back to O32. The same goes if O32 is asked for - old
++# GCCs doesn't like the -mabi option, and new GCCs can't output O32.
++#
++# Don't you just love *all* the different SGI ABIs?
++
++case "${with_mips_abi}" in 
++        32|o32) abi='-mabi=32';  abilibdirext=''     ;;
++       n32|yes) abi='-mabi=n32'; abilibdirext='32'  ;;
++        64) abi='-mabi=64';  abilibdirext='64'   ;;
++	no) abi=''; abilibdirext='';;
++         *) { { echo "$as_me:$LINENO: error: \"Invalid ABI specified\"" >&5
++echo "$as_me: error: \"Invalid ABI specified\"" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++if test -n "$abi" ; then
++ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
++echo "$as_me:$LINENO: checking if $CC supports the $abi option" >&5
++echo $ECHO_N "checking if $CC supports the $abi option... $ECHO_C" >&6
++if eval "test \"\${$ac_foo+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS $abi"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++int x;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval $ac_foo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval $ac_foo=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++
++fi
++
++ac_res=`eval echo \\\$$ac_foo`
++echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6
++if test $ac_res = no; then
++# Try to figure out why that failed...
++case $abi in
++	-mabi=32) 
++	save_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -mabi=n32"
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++int x;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_res=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_res=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	CLAGS="$save_CFLAGS"
++	if test $ac_res = yes; then
++		# New GCC
++		{ { echo "$as_me:$LINENO: error: $CC does not support the $with_mips_abi ABI" >&5
++echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
++	# Old GCC
++	abi=''
++	abilibdirext=''
++	;;
++	-mabi=n32|-mabi=64)
++		if test $with_mips_abi = yes; then
++			# Old GCC, default to O32
++			abi=''
++			abilibdirext=''
++		else
++			# Some broken GCC
++			{ { echo "$as_me:$LINENO: error: $CC does not support the $with_mips_abi ABI" >&5
++echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
++   { (exit 1); exit 1; }; }
++		fi
++	;;
++esac
++fi #if test $ac_res = no; then
++fi #if test -n "$abi" ; then
++else
++case "${with_mips_abi}" in
++        32|o32) abi='-32'; abilibdirext=''     ;;
++       n32|yes) abi='-n32'; abilibdirext='32'  ;;
++        64) abi='-64'; abilibdirext='64'   ;;
++	no) abi=''; abilibdirext='';;
++         *) { { echo "$as_me:$LINENO: error: \"Invalid ABI specified\"" >&5
++echo "$as_me: error: \"Invalid ABI specified\"" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++fi #if test -n "$GCC"; then
++;;
++esac
++
++CC="$CC $abi"
++libdir="$libdir$abilibdirext"
++
++
++echo "$as_me:$LINENO: checking for __attribute__" >&5
++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
++if test "${ac_cv___attribute__+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv___attribute__=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv___attribute__=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++if test "$ac_cv___attribute__" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6
++
++
++# Check whether --enable-shared or --disable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval="$enable_shared"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_shared=no
++fi; 
++
++# Check whether --enable-static or --disable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval="$enable_static"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_static=yes
++fi; 
++
++# Check whether --enable-fast-install or --disable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval="$enable_fast_install"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_fast_install=yes
++fi; 
++
++echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++if test "${lt_cv_path_SED+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++SED=$lt_cv_path_SED
++
++fi
++
++echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6
++
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++ 
++
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi; 
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++if test "${lt_cv_ld_reload_flag+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++
++echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++if test "${lt_cv_path_NM+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6
++NM="$lt_cv_path_NM"
++
++echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++LN_S=$as_ln_s
++if test "$LN_S" = "ln -s"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6
++fi
++
++echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++if test "${lt_cv_deplibs_check_method+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | kfreebsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
++openbsd*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++  else
++    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  
++fi; 
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line __oline__ "configure"' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++if test "${lt_cv_cc_needs_belf+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lt_cv_cc_needs_belf=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_cv_cc_needs_belf=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++     ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++esac
++
++need_locks="$enable_libtool_lock"
++
++
++
++echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++if test "${ac_cv_header_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_header_stdc=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6
++if test $ac_cv_header_stdc = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++for ac_header in dlfcn.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CXX"; then
++  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++  echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CXX" && break
++  done
++fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CXX"; then
++  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CXX" && break
++done
++test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
++
++  CXX=$ac_ct_CXX
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++GXX=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++CXXFLAGS="-g"
++echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cxx_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cxx_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cxx_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
++for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
++echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
++if test -z "$CXXCPP"; then
++  if test "${ac_cv_prog_CXXCPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++  
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++echo "$as_me:$LINENO: result: $CXXCPP" >&5
++echo "${ECHO_T}$CXXCPP" >&6
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++  echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_F77" && break
++done
++
++  F77=$ac_ct_F77
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:__oline__:" \
++     "checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_f77_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
++  fi
++else
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
++fi
++
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++
++# find the maximum length of command line arguments
++echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++
++fi
++
++if test -n $lt_cv_sys_max_cmd_len ; then
++  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++else
++  echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6
++fi
++
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDRT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[ABCDGIRSTW]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
++  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6
++else
++  echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++fi
++
++echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++if test "${lt_cv_objdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++fi
++echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6
++objdir=$lt_cv_objdir
++
++
++
++
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AR="ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AR=$ac_ct_AR
++else
++  AR="$ac_cv_prog_AR"
++fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  else
++    MAGIC_CMD=:
++  fi
++fi
++
++  fi
++  ;;
++esac
++
++enable_dlopen=no
++enable_win32_dll=no
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  
++fi; 
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi; 
++test -z "$pic_mode" && pic_mode=default
++
++# Use C for the default configuration in the libtool script
++tagname=
++lt_save_CC="$CC"
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++#
++# Check for any special shared library compilation flags.
++#
++lt_prog_cc_shlib=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    lt_prog_cc_shlib='-belf'
++    ;;
++  esac
++fi
++if test -n "$lt_prog_cc_shlib"; then
++  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
++echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
++  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
++echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++
++#
++# Check to make sure the static flag actually works.
++#
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++     else
++       lt_prog_compiler_static_works=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
++fi
++
++
++
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++  
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      else
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic='-Kpic'
++      lt_prog_compiler_static='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++
++if test x"$lt_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag=
++  enable_shared_with_static_runtimes=no
++  archive_cmds=
++  archive_expsym_cmds=
++  old_archive_From_new_cmds=
++  old_archive_from_expsyms_cmds=
++  export_dynamic_flag_spec=
++  whole_archive_flag_spec=
++  thread_safe_flag_spec=
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_direct=no
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  link_all_deplibs=unknown
++  hardcode_automatic=no
++  module_cmds=
++  module_expsym_cmds=
++  always_export_symbols=no
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds="$tmp_archive_cmds"
++      fi
++      link_all_deplibs=no
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L=yes
++  	  hardcode_libdir_flag_spec='-L$libdir'
++  	  hardcode_libdir_separator=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec=' '
++	  archive_cmds_need_lc=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
++
++    bsdi4*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
++      allow_undefined_flag=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
++
++    darwin* | rhapsody*)
++    if test "$GXX" = yes ; then
++      archive_cmds_need_lc=no
++      case "$host_os" in
++      rhapsody* | darwin1.[012])
++	allow_undefined_flag='-undefined suppress'
++	;;
++      *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	allow_undefined_flag='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[012])
++            allow_undefined_flag='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            allow_undefined_flag='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++	;;
++      esac
++    	lt_int_apple_cc_single_mod=no
++    	output_verbose_link_cmd='echo'
++    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
++    	  lt_int_apple_cc_single_mod=yes
++    	fi
++    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    	else
++        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      fi
++      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        else
++          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        fi
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      hardcode_direct=no
++      hardcode_automatic=yes
++      hardcode_shlibpath_var=unsupported
++      whole_archive_flag_spec='-all_load $convenience'
++      link_all_deplibs=yes
++    else
++      ld_shlibs=no
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld='+b $libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=yes
++	  export_dynamic_flag_spec='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      link_all_deplibs=yes
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
++
++    openbsd*)
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=no
++      hardcode_shlibpath_var=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec=
++      hardcode_shlibpath_var=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    *)
++      ld_shlibs=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=yes
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var " || \
++   test "X$hardcode_automatic"="Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# Report which librarie types wil actually be built
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++  darwin* | rhapsody*)
++  if test "$GCC" = yes; then
++    archive_cmds_need_lc=no
++    case "$host_os" in
++    rhapsody* | darwin1.[012])
++      allow_undefined_flag='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	allow_undefined_flag='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[012])
++            allow_undefined_flag='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            allow_undefined_flag='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++      ;;
++    esac
++    output_verbose_link_cmd='echo'
++    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
++    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    hardcode_direct=no
++    hardcode_automatic=yes
++    hardcode_shlibpath_var=unsupported
++    whole_archive_flag_spec='-all_load $convenience'
++    link_all_deplibs=yes
++  else
++    ld_shlibs=no
++  fi
++    ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler \
++    CC \
++    LD \
++    lt_prog_compiler_wl \
++    lt_prog_compiler_pic \
++    lt_prog_compiler_static \
++    lt_prog_compiler_no_builtin_flag \
++    export_dynamic_flag_spec \
++    thread_safe_flag_spec \
++    whole_archive_flag_spec \
++    enable_shared_with_static_runtimes \
++    old_archive_cmds \
++    old_archive_from_new_cmds \
++    predep_objects \
++    postdep_objects \
++    predeps \
++    postdeps \
++    compiler_lib_search_path \
++    archive_cmds \
++    archive_expsym_cmds \
++    postinstall_cmds \
++    postuninstall_cmds \
++    old_archive_from_expsyms_cmds \
++    allow_undefined_flag \
++    no_undefined_flag \
++    export_symbols_cmds \
++    hardcode_libdir_flag_spec \
++    hardcode_libdir_flag_spec_ld \
++    hardcode_libdir_separator \
++    hardcode_automatic \
++    module_cmds \
++    module_expsym_cmds \
++    lt_cv_prog_compiler_c_o \
++    exclude_expsyms \
++    include_expsyms; do
++
++    case $var in
++    old_archive_cmds | \
++    old_archive_from_new_cmds | \
++    archive_cmds | \
++    archive_expsym_cmds | \
++    module_cmds | \
++    module_expsym_cmds | \
++    old_archive_from_expsyms_cmds | \
++    export_symbols_cmds | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
++
++  cat <<__EOF__ >> "$cfgfile"
++#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++
++# Check whether --with-tags or --without-tags was given.
++if test "${with_tags+set}" = set; then
++  withval="$with_tags"
++  tagnames="$withval"
++fi; 
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++    else
++      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++    fi
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
++    "") ;;
++    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && test "X$CXX" != "Xno"; then
++	  ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++
++
++
++
++archive_cmds_need_lc_CXX=no
++allow_undefined_flag_CXX=
++always_export_symbols_CXX=no
++archive_expsym_cmds_CXX=
++export_dynamic_flag_spec_CXX=
++hardcode_direct_CXX=no
++hardcode_libdir_flag_spec_CXX=
++hardcode_libdir_flag_spec_ld_CXX=
++hardcode_libdir_separator_CXX=
++hardcode_minus_L_CXX=no
++hardcode_automatic_CXX=no
++module_cmds_CXX=
++module_expsym_cmds_CXX=
++link_all_deplibs_CXX=unknown
++old_archive_cmds_CXX=$old_archive_cmds
++no_undefined_flag_CXX=
++whole_archive_flag_spec_CXX=
++enable_shared_with_static_runtimes_CXX=no
++
++# Dependencies to place before and after the object being linked:
++predep_objects_CXX=
++postdep_objects_CXX=
++predeps_CXX=
++postdeps_CXX=
++compiler_lib_search_path_CXX=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
++objext=o
++objext_CXX=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++compiler_CXX=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++else
++  lt_prog_compiler_no_builtin_flag_CXX=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++  
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi; 
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec_CXX=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++ld_shlibs_CXX=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    archive_cmds_CXX=''
++    hardcode_direct_CXX=yes
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.012|aix4.012.*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct_CXX=yes
++	else
++	  # We have old collect2
++	  hardcode_direct_CXX=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L_CXX=yes
++	  hardcode_libdir_flag_spec_CXX='-L$libdir'
++	  hardcode_libdir_separator_CXX=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag_CXX='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag_CXX="-z nodefs"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	no_undefined_flag_CXX=' ${wl}-bernotok'
++	allow_undefined_flag_CXX=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	always_export_symbols_CXX=yes
++	# Exported symbols can be pulled into shared objects from archives
++	whole_archive_flag_spec_CXX=' '
++	archive_cmds_need_lc_CXX=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++    # as there is no search path for DLLs.
++    hardcode_libdir_flag_spec_CXX='-L$libdir'
++    allow_undefined_flag_CXX=unsupported
++    always_export_symbols_CXX=no
++    enable_shared_with_static_runtimes_CXX=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      ld_shlibs_CXX=no
++    fi
++  ;;
++
++  darwin* | rhapsody*)
++  if test "$GXX" = yes; then
++    archive_cmds_need_lc_CXX=no
++    case "$host_os" in
++    rhapsody* | darwin1.[012])
++      allow_undefined_flag_CXX='-undefined suppress'
++      ;;
++    *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[012])
++            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            allow_undefined_flag_CXX='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++      ;;
++    esac
++    lt_int_apple_cc_single_mod=no
++    output_verbose_link_cmd='echo'
++    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
++      lt_int_apple_cc_single_mod=yes
++    fi
++    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    else
++      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    fi
++    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++
++    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    fi
++    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    hardcode_direct_CXX=no
++    hardcode_automatic_CXX=yes
++    hardcode_shlibpath_var_CXX=unsupported
++    whole_archive_flag_spec_CXX='-all_load $convenience'
++    link_all_deplibs_CXX=yes
++  else
++    ld_shlibs_CXX=no
++  fi
++    ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  freebsd12*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    ld_shlibs_CXX=no
++    ;;
++  freebsd-elf*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    ld_shlibs_CXX=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    hardcode_direct_CXX=yes
++    hardcode_minus_L_CXX=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      ld_shlibs_CXX=no
++      ;;
++    aCC)
++      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
++	hardcode_libdir_separator_CXX=:
++        ;;
++      ia64*)
++	hardcode_libdir_flag_spec_CXX='-L$libdir'
++        ;;
++      *)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++	export_dynamic_flag_spec_CXX='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      ;;
++    ia64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      hardcode_direct_CXX=yes
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	link_all_deplibs_CXX=yes
++	;;
++    esac
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	archive_cmds_need_lc_CXX=no
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      hardcode_libdir_flag_spec_CXX='-R$libdir'
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' -expect_unresolved \*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  sco*)
++    archive_cmds_need_lc_CXX=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	no_undefined_flag_CXX=' -zdefs'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-R$libdir'
++	hardcode_shlibpath_var_CXX=no
++	case $host_os in
++	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	link_all_deplibs_CXX=yes
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++esac
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++GCC_CXX="$GXX"
++LD_CXX="$LD"
++
++
++cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$compiler_lib_search_path_CXX"; then
++	     compiler_lib_search_path_CXX="${prev}${p}"
++	   else
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$postdeps_CXX"; then
++	   postdeps_CXX="${prev}${p}"
++	 else
++	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$predep_objects_CXX"; then
++	   predep_objects_CXX="$p"
++	 else
++	   predep_objects_CXX="$predep_objects_CXX $p"
++	 fi
++       else
++	 if test -z "$postdep_objects_CXX"; then
++	   postdep_objects_CXX="$p"
++	 else
++	   postdep_objects_CXX="$postdep_objects_CXX $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling CXX test program"
++fi
++
++$rm -f confest.$objext
++
++case " $postdeps_CXX " in
++*" -lc "*) archive_cmds_need_lc_CXX=no ;;
++esac
++
++lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    lt_prog_compiler_wl_CXX='-Wl,'
++    lt_prog_compiler_static_CXX='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_CXX='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_CXX='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      lt_prog_compiler_pic_CXX=
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_CXX=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	;;
++      *)
++	lt_prog_compiler_pic_CXX='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      lt_prog_compiler_pic_CXX='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  lt_prog_compiler_static_CXX='-Bstatic'
++	else
++	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++      dgux*)
++	case $cc_basename in
++	  ec++)
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  ghcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | kfreebsd*-gnu)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    if test "$host_cpu" != ia64; then
++	      lt_prog_compiler_pic_CXX='+Z'
++	    fi
++	    ;;
++	  aCC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    case "$host_cpu" in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      lt_prog_compiler_pic_CXX='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux*)
++	case $cc_basename in
++	  KCC)
++	    # KAI C++ Compiler
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  icpc)
++	    # Intel C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  cxx)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx)
++	    lt_prog_compiler_pic_CXX='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC)
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    ;;
++	  RCC)
++	    # Rational C++ 2.4.1
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  cxx)
++	    # Digital/Compaq C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      sco*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    lt_prog_compiler_wl_CXX='-Qoption ld '
++	    ;;
++	  gcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.x
++	    lt_prog_compiler_pic_CXX='-pic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  lcc)
++	    # Lucid
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC)
++	    # NonStop-UX NCC 3.20
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	lt_prog_compiler_can_build_shared_CXX=no
++	;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_CXX"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_CXX=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++
++if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++    case $lt_prog_compiler_pic_CXX in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++     esac
++else
++    lt_prog_compiler_pic_CXX=
++     lt_prog_compiler_can_build_shared_CXX=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_CXX=
++    ;;
++  *)
++    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_CXX=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    else
++      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    export_symbols_cmds_CXX="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux*)
++    link_all_deplibs_CXX=no
++  ;;
++  *)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_CXX=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_CXX in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_CXX
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++        allow_undefined_flag_CXX=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_CXX=no
++        else
++	  archive_cmds_need_lc_CXX=yes
++        fi
++        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=yes
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_CXX=
++if test -n "$hardcode_libdir_flag_spec_CXX" || \
++   test -n "$runpath_var CXX" || \
++   test "X$hardcode_automatic_CXX"="Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_CXX" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
++     test "$hardcode_minus_L_CXX" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_CXX=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_CXX=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_CXX=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6
++
++if test "$hardcode_action_CXX" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
++
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_CXX
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_CXX
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_CXX
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++
++
++archive_cmds_need_lc_F77=no
++allow_undefined_flag_F77=
++always_export_symbols_F77=no
++archive_expsym_cmds_F77=
++export_dynamic_flag_spec_F77=
++hardcode_direct_F77=no
++hardcode_libdir_flag_spec_F77=
++hardcode_libdir_flag_spec_ld_F77=
++hardcode_libdir_separator_F77=
++hardcode_minus_L_F77=no
++hardcode_automatic_F77=no
++module_cmds_F77=
++module_expsym_cmds_F77=
++link_all_deplibs_F77=unknown
++old_archive_cmds_F77=$old_archive_cmds
++no_undefined_flag_F77=
++whole_archive_flag_spec_F77=
++enable_shared_with_static_runtimes_F77=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++objext_F77=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++compiler_F77=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++GCC_F77="$G77"
++LD_F77="$LD"
++
++lt_prog_compiler_wl_F77=
++lt_prog_compiler_pic_F77=
++lt_prog_compiler_static_F77=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_F77='-Wl,'
++    lt_prog_compiler_static_F77='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_F77='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_F77=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_F77=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_F77='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      else
++	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-KPIC'
++	lt_prog_compiler_static_F77='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_F77='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_F77='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_F77='-Kpic'
++      lt_prog_compiler_static_F77='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_F77='-Qoption ld '
++      lt_prog_compiler_pic_F77='-PIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_F77='-Kconform_pic'
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_F77"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_F77=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_F77"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++
++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++    case $lt_prog_compiler_pic_F77 in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
++     esac
++else
++    lt_prog_compiler_pic_F77=
++     lt_prog_compiler_can_build_shared_F77=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_F77=
++    ;;
++  *)
++    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_F77=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_F77=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_F77=
++  enable_shared_with_static_runtimes_F77=no
++  archive_cmds_F77=
++  archive_expsym_cmds_F77=
++  old_archive_From_new_cmds_F77=
++  old_archive_from_expsyms_cmds_F77=
++  export_dynamic_flag_spec_F77=
++  whole_archive_flag_spec_F77=
++  thread_safe_flag_spec_F77=
++  hardcode_libdir_flag_spec_F77=
++  hardcode_libdir_flag_spec_ld_F77=
++  hardcode_libdir_separator_F77=
++  hardcode_direct_F77=no
++  hardcode_minus_L_F77=no
++  hardcode_shlibpath_var_F77=unsupported
++  link_all_deplibs_F77=unknown
++  hardcode_automatic_F77=no
++  module_cmds_F77=
++  module_expsym_cmds_F77=
++  always_export_symbols_F77=no
++  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_F77=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_F77=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_F77=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_F77=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=no
++      enable_shared_with_static_runtimes_F77=yes
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_F77="$tmp_archive_cmds"
++      fi
++      link_all_deplibs_F77=no
++    else
++      ld_shlibs_F77=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_F77" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=yes
++      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_F77=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_F77=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_F77=''
++      hardcode_direct_F77=yes
++      hardcode_libdir_separator_F77=':'
++      link_all_deplibs_F77=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_F77=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_F77=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_F77=yes
++  	  hardcode_libdir_flag_spec_F77='-L$libdir'
++  	  hardcode_libdir_separator_F77=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_F77=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_F77='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_F77="-z nodefs"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_F77=' ${wl}-bernotok'
++	  allow_undefined_flag_F77=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_F77=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_F77=' '
++	  archive_cmds_need_lc_F77=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_F77=no
++      ;;
++
++    bsdi4*)
++      export_dynamic_flag_spec_F77=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_F77=' '
++      allow_undefined_flag_F77=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_F77='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_F77=yes
++      ;;
++
++    darwin* | rhapsody*)
++    if test "$GXX" = yes ; then
++      archive_cmds_need_lc_F77=no
++      case "$host_os" in
++      rhapsody* | darwin1.[012])
++	allow_undefined_flag_F77='-undefined suppress'
++	;;
++      *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[012])
++            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            allow_undefined_flag_F77='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++	;;
++      esac
++    	lt_int_apple_cc_single_mod=no
++    	output_verbose_link_cmd='echo'
++    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
++    	  lt_int_apple_cc_single_mod=yes
++    	fi
++    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    	else
++        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      fi
++      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        else
++          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        fi
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      hardcode_direct_F77=no
++      hardcode_automatic_F77=yes
++      hardcode_shlibpath_var_F77=unsupported
++      whole_archive_flag_spec_F77='-all_load $convenience'
++      link_all_deplibs_F77=yes
++    else
++      ld_shlibs_F77=no
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_F77=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_direct_F77=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_F77=yes
++      export_dynamic_flag_spec_F77='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_F77='-L$libdir'
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=yes
++	  export_dynamic_flag_spec_F77='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      link_all_deplibs_F77=yes
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    newsos6)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_F77='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      allow_undefined_flag_F77=unsupported
++      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_F77=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_shlibpath_var_F77=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_F77=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_F77='$CC -r -o $output$reload_objs'
++	  hardcode_direct_F77=no
++        ;;
++	motorola)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_F77=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_F77=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=no
++      hardcode_shlibpath_var_F77=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_F77='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_F77=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_F77=
++      hardcode_shlibpath_var_F77=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    *)
++      ld_shlibs_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_F77" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_F77=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_F77 in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_F77
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
++        allow_undefined_flag_F77=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_F77=no
++        else
++	  archive_cmds_need_lc_F77=yes
++        fi
++        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=yes
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_F77=
++if test -n "$hardcode_libdir_flag_spec_F77" || \
++   test -n "$runpath_var F77" || \
++   test "X$hardcode_automatic_F77"="Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_F77" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
++     test "$hardcode_minus_L_F77" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_F77=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_F77=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_F77=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6
++
++if test "$hardcode_action_F77" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_F77 \
++    CC_F77 \
++    LD_F77 \
++    lt_prog_compiler_wl_F77 \
++    lt_prog_compiler_pic_F77 \
++    lt_prog_compiler_static_F77 \
++    lt_prog_compiler_no_builtin_flag_F77 \
++    export_dynamic_flag_spec_F77 \
++    thread_safe_flag_spec_F77 \
++    whole_archive_flag_spec_F77 \
++    enable_shared_with_static_runtimes_F77 \
++    old_archive_cmds_F77 \
++    old_archive_from_new_cmds_F77 \
++    predep_objects_F77 \
++    postdep_objects_F77 \
++    predeps_F77 \
++    postdeps_F77 \
++    compiler_lib_search_path_F77 \
++    archive_cmds_F77 \
++    archive_expsym_cmds_F77 \
++    postinstall_cmds_F77 \
++    postuninstall_cmds_F77 \
++    old_archive_from_expsyms_cmds_F77 \
++    allow_undefined_flag_F77 \
++    no_undefined_flag_F77 \
++    export_symbols_cmds_F77 \
++    hardcode_libdir_flag_spec_F77 \
++    hardcode_libdir_flag_spec_ld_F77 \
++    hardcode_libdir_separator_F77 \
++    hardcode_automatic_F77 \
++    module_cmds_F77 \
++    module_expsym_cmds_F77 \
++    lt_cv_prog_compiler_c_o_F77 \
++    exclude_expsyms_F77 \
++    include_expsyms_F77; do
++
++    case $var in
++    old_archive_cmds_F77 | \
++    old_archive_from_new_cmds_F77 | \
++    archive_cmds_F77 | \
++    archive_expsym_cmds_F77 | \
++    module_cmds_F77 | \
++    module_expsym_cmds_F77 | \
++    old_archive_from_expsyms_cmds_F77 | \
++    export_symbols_cmds_F77 | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_F77
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_F77
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_F77
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_F77
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_F77
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_F77
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_F77
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_F77
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_F77
++archive_expsym_cmds=$lt_archive_expsym_cmds_F77
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_F77
++module_expsym_cmds=$lt_module_expsym_cmds_F77
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_F77
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_F77
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_F77
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_F77
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_F77
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_F77
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_F77
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_F77
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_F77
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_F77
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_F77"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_F77
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_F77
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_F77
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_F77
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  
++
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++objext_GCJ=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++compiler_GCJ=$CC
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++archive_cmds_need_lc_GCJ=no
++
++
++lt_prog_compiler_no_builtin_flag_GCJ=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
++
++  
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl_GCJ=
++lt_prog_compiler_pic_GCJ=
++lt_prog_compiler_static_GCJ=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_GCJ='-Wl,'
++    lt_prog_compiler_static_GCJ='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_GCJ='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_GCJ=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_GCJ=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_GCJ='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      else
++	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-KPIC'
++	lt_prog_compiler_static_GCJ='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_GCJ='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_GCJ='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_GCJ='-Kpic'
++      lt_prog_compiler_static_GCJ='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_GCJ='-Qoption ld '
++      lt_prog_compiler_pic_GCJ='-PIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_GCJ='-Kconform_pic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_GCJ='-pic'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_GCJ"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_GCJ=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++
++if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++    case $lt_prog_compiler_pic_GCJ in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
++     esac
++else
++    lt_prog_compiler_pic_GCJ=
++     lt_prog_compiler_can_build_shared_GCJ=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_GCJ=
++    ;;
++  *)
++    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_GCJ=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_GCJ=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_GCJ=
++  enable_shared_with_static_runtimes_GCJ=no
++  archive_cmds_GCJ=
++  archive_expsym_cmds_GCJ=
++  old_archive_From_new_cmds_GCJ=
++  old_archive_from_expsyms_cmds_GCJ=
++  export_dynamic_flag_spec_GCJ=
++  whole_archive_flag_spec_GCJ=
++  thread_safe_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_ld_GCJ=
++  hardcode_libdir_separator_GCJ=
++  hardcode_direct_GCJ=no
++  hardcode_minus_L_GCJ=no
++  hardcode_shlibpath_var_GCJ=unsupported
++  link_all_deplibs_GCJ=unknown
++  hardcode_automatic_GCJ=no
++  module_cmds_GCJ=
++  module_expsym_cmds_GCJ=
++  always_export_symbols_GCJ=no
++  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_GCJ=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_GCJ=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_GCJ=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_GCJ=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=no
++      enable_shared_with_static_runtimes_GCJ=yes
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_GCJ="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
++      fi
++      link_all_deplibs_GCJ=no
++    else
++      ld_shlibs_GCJ=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_GCJ" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=yes
++      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_GCJ=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_GCJ=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_GCJ=''
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_GCJ=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_GCJ=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_GCJ=yes
++  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++  	  hardcode_libdir_separator_GCJ=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_GCJ='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_GCJ="-z nodefs"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_GCJ=' ${wl}-bernotok'
++	  allow_undefined_flag_GCJ=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_GCJ=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_GCJ=' '
++	  archive_cmds_need_lc_GCJ=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_GCJ=no
++      ;;
++
++    bsdi4*)
++      export_dynamic_flag_spec_GCJ=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ=' '
++      allow_undefined_flag_GCJ=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_GCJ='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_GCJ=yes
++      ;;
++
++    darwin* | rhapsody*)
++    if test "$GXX" = yes ; then
++      archive_cmds_need_lc_GCJ=no
++      case "$host_os" in
++      rhapsody* | darwin1.[012])
++	allow_undefined_flag_GCJ='-undefined suppress'
++	;;
++      *) # Darwin 1.3 on
++      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
++      else
++        case ${MACOSX_DEPLOYMENT_TARGET} in
++          10.[012])
++            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
++            ;;
++          10.*)
++            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
++            ;;
++        esac
++      fi
++	;;
++      esac
++    	lt_int_apple_cc_single_mod=no
++    	output_verbose_link_cmd='echo'
++    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
++    	  lt_int_apple_cc_single_mod=yes
++    	fi
++    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++    	else
++        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      fi
++      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        else
++          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        fi
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      hardcode_direct_GCJ=no
++      hardcode_automatic_GCJ=yes
++      hardcode_shlibpath_var_GCJ=unsupported
++      whole_archive_flag_spec_GCJ='-all_load $convenience'
++      link_all_deplibs_GCJ=yes
++    else
++      ld_shlibs_GCJ=no
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_GCJ=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_direct_GCJ=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=yes
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    newsos6)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      allow_undefined_flag_GCJ=unsupported
++      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_GCJ=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
++	  hardcode_direct_GCJ=no
++        ;;
++	motorola)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_GCJ=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_GCJ=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_GCJ=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_GCJ=
++      hardcode_shlibpath_var_GCJ=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    *)
++      ld_shlibs_GCJ=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_GCJ" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_GCJ=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_GCJ in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_GCJ
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
++        allow_undefined_flag_GCJ=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_GCJ=no
++        else
++	  archive_cmds_need_lc_GCJ=yes
++        fi
++        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=yes
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++   test -n "$runpath_var GCJ" || \
++   test "X$hardcode_automatic_GCJ"="Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_GCJ" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++     test "$hardcode_minus_L_GCJ" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_GCJ=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_GCJ=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_GCJ=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6
++
++if test "$hardcode_action_GCJ" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_GCJ \
++    CC_GCJ \
++    LD_GCJ \
++    lt_prog_compiler_wl_GCJ \
++    lt_prog_compiler_pic_GCJ \
++    lt_prog_compiler_static_GCJ \
++    lt_prog_compiler_no_builtin_flag_GCJ \
++    export_dynamic_flag_spec_GCJ \
++    thread_safe_flag_spec_GCJ \
++    whole_archive_flag_spec_GCJ \
++    enable_shared_with_static_runtimes_GCJ \
++    old_archive_cmds_GCJ \
++    old_archive_from_new_cmds_GCJ \
++    predep_objects_GCJ \
++    postdep_objects_GCJ \
++    predeps_GCJ \
++    postdeps_GCJ \
++    compiler_lib_search_path_GCJ \
++    archive_cmds_GCJ \
++    archive_expsym_cmds_GCJ \
++    postinstall_cmds_GCJ \
++    postuninstall_cmds_GCJ \
++    old_archive_from_expsyms_cmds_GCJ \
++    allow_undefined_flag_GCJ \
++    no_undefined_flag_GCJ \
++    export_symbols_cmds_GCJ \
++    hardcode_libdir_flag_spec_GCJ \
++    hardcode_libdir_flag_spec_ld_GCJ \
++    hardcode_libdir_separator_GCJ \
++    hardcode_automatic_GCJ \
++    module_cmds_GCJ \
++    module_expsym_cmds_GCJ \
++    lt_cv_prog_compiler_c_o_GCJ \
++    exclude_expsyms_GCJ \
++    include_expsyms_GCJ; do
++
++    case $var in
++    old_archive_cmds_GCJ | \
++    old_archive_from_new_cmds_GCJ | \
++    archive_cmds_GCJ | \
++    archive_expsym_cmds_GCJ | \
++    module_cmds_GCJ | \
++    module_expsym_cmds_GCJ | \
++    old_archive_from_expsyms_cmds_GCJ | \
++    export_symbols_cmds_GCJ | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_GCJ
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_GCJ
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_GCJ
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_GCJ
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_GCJ
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_GCJ
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_GCJ
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_GCJ
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_GCJ
++archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_GCJ
++module_expsym_cmds=$lt_module_expsym_cmds_GCJ
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_GCJ
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_GCJ
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_GCJ
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_GCJ
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_GCJ
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_GCJ
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_GCJ
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_GCJ
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_GCJ
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_GCJ"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_GCJ
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_GCJ
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_GCJ
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_GCJ
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      RC)
++	
++
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++objext_RC=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++compiler_RC=$CC
++lt_cv_prog_compiler_c_o_RC=yes
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_RC \
++    CC_RC \
++    LD_RC \
++    lt_prog_compiler_wl_RC \
++    lt_prog_compiler_pic_RC \
++    lt_prog_compiler_static_RC \
++    lt_prog_compiler_no_builtin_flag_RC \
++    export_dynamic_flag_spec_RC \
++    thread_safe_flag_spec_RC \
++    whole_archive_flag_spec_RC \
++    enable_shared_with_static_runtimes_RC \
++    old_archive_cmds_RC \
++    old_archive_from_new_cmds_RC \
++    predep_objects_RC \
++    postdep_objects_RC \
++    predeps_RC \
++    postdeps_RC \
++    compiler_lib_search_path_RC \
++    archive_cmds_RC \
++    archive_expsym_cmds_RC \
++    postinstall_cmds_RC \
++    postuninstall_cmds_RC \
++    old_archive_from_expsyms_cmds_RC \
++    allow_undefined_flag_RC \
++    no_undefined_flag_RC \
++    export_symbols_cmds_RC \
++    hardcode_libdir_flag_spec_RC \
++    hardcode_libdir_flag_spec_ld_RC \
++    hardcode_libdir_separator_RC \
++    hardcode_automatic_RC \
++    module_cmds_RC \
++    module_expsym_cmds_RC \
++    lt_cv_prog_compiler_c_o_RC \
++    exclude_expsyms_RC \
++    include_expsyms_RC; do
++
++    case $var in
++    old_archive_cmds_RC | \
++    old_archive_from_new_cmds_RC | \
++    archive_cmds_RC | \
++    archive_expsym_cmds_RC | \
++    module_cmds_RC | \
++    module_expsym_cmds_RC | \
++    old_archive_from_expsyms_cmds_RC | \
++    export_symbols_cmds_RC | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_RC
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_RC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_RC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_RC
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_RC
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_RC
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_RC
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_RC
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_RC
++archive_expsym_cmds=$lt_archive_expsym_cmds_RC
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_RC
++module_expsym_cmds=$lt_module_expsym_cmds_RC
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_RC
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_RC
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_RC
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_RC
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_RC
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_RC
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_RC
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_RC
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_RC
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_RC
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_RC"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_RC
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_RC
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_RC
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_RC
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	;;
++
++      *)
++	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
++echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++      esac
++
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
++echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++fi
++
++
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Prevent multiple expansion
++
++
++
++
++
++
++
++
++
++
++
++  
++
++  
++
++
++  
++       
++       
++
++
++
++WFLAGS_NOUNUSED=""
++WFLAGS_NOIMPLICITINT=""
++if test -z "$WFLAGS" -a "$GCC" = "yes"; then
++  # -Wno-implicit-int for broken X11 headers
++  # leave these out for now:
++  #   -Wcast-align doesn't work well on alpha osf/1
++  #   -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast
++  #   -Wmissing-declarations -Wnested-externs
++  WFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs"
++  WFLAGS_NOUNUSED="-Wno-unused"
++  WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
++fi
++
++
++
++
++# Check whether --with-openldap or --without-openldap was given.
++if test "${with_openldap+set}" = set; then
++  withval="$with_openldap"
++  
++fi; 
++
++# Check whether --with-openldap-lib or --without-openldap-lib was given.
++if test "${with_openldap_lib+set}" = set; then
++  withval="$with_openldap_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-openldap-lib" >&5
++echo "$as_me: error: No argument for --with-openldap-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_openldap" = "X"; then
++  with_openldap=yes
++fi
++fi; 
++
++# Check whether --with-openldap-include or --without-openldap-include was given.
++if test "${with_openldap_include+set}" = set; then
++  withval="$with_openldap_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-openldap-include" >&5
++echo "$as_me: error: No argument for --with-openldap-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_openldap" = "X"; then
++  with_openldap=yes
++fi
++fi; 
++
++# Check whether --with-openldap-config or --without-openldap-config was given.
++if test "${with_openldap_config+set}" = set; then
++  withval="$with_openldap_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for openldap" >&5
++echo $ECHO_N "checking for openldap... $ECHO_C" >&6
++
++case "$with_openldap" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_openldap" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_openldap_include" = ""; then
++		if test -d "$i/include/openldap"; then
++			header_dirs="$header_dirs $i/include/openldap"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_openldap_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_openldap_include"; then
++	header_dirs="$with_openldap_include $header_dirs"
++fi
++if test "$with_openldap_lib"; then
++	lib_dirs="$with_openldap_lib $lib_dirs"
++fi
++
++if test "$with_openldap_config" = ""; then
++	with_openldap_config=''
++fi
++
++openldap_cflags=
++openldap_libs=
++
++case "$with_openldap_config" in
++yes|no|"")
++	;;
++*)
++	openldap_cflags="`$with_openldap_config --cflags 2>&1`"
++	openldap_libs="`$with_openldap_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_openldap" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$openldap_cflags" -a "$openldap_libs"; then
++		CFLAGS="$openldap_cflags $save_CFLAGS"
++		LIBS="$openldap_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <lber.h>
++#include <ldap.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_openldap="$openldap_cflags"
++			LIB_openldap="$openldap_libs"
++			echo "$as_me:$LINENO: result: from $with_openldap_config" >&5
++echo "${ECHO_T}from $with_openldap_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <lber.h>
++#include <ldap.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lldap -llber  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <lber.h>
++#include <ldap.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_openldap" != "no"; then
++			DIR_openldap=
++			INCLUDE_openldap="-I$ires"
++			LIB_openldap="-L$lres -lldap -llber "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define OPENLDAP 1
++_ACEOF
++
++	with_openldap=yes
++else
++	with_openldap=no
++	DIR_openldap=
++	INCLUDE_openldap=
++	LIB_openldap=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++
++
++
++# Check whether --with-krb4 or --without-krb4 was given.
++if test "${with_krb4+set}" = set; then
++  withval="$with_krb4"
++  
++fi; 
++
++# Check whether --with-krb4-lib or --without-krb4-lib was given.
++if test "${with_krb4_lib+set}" = set; then
++  withval="$with_krb4_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-krb4-lib" >&5
++echo "$as_me: error: No argument for --with-krb4-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_krb4" = "X"; then
++  with_krb4=yes
++fi
++fi; 
++
++# Check whether --with-krb4-include or --without-krb4-include was given.
++if test "${with_krb4_include+set}" = set; then
++  withval="$with_krb4_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-krb4-include" >&5
++echo "$as_me: error: No argument for --with-krb4-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_krb4" = "X"; then
++  with_krb4=yes
++fi
++fi; 
++
++# Check whether --with-krb4-config or --without-krb4-config was given.
++if test "${with_krb4_config+set}" = set; then
++  withval="$with_krb4_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for krb4" >&5
++echo $ECHO_N "checking for krb4... $ECHO_C" >&6
++
++case "$with_krb4" in
++yes|"") d='/usr/athena' ;;
++no)	d= ;;
++*)	d="$with_krb4" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_krb4_include" = ""; then
++		if test -d "$i/include/krb4"; then
++			header_dirs="$header_dirs $i/include/krb4"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_krb4_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_krb4_include"; then
++	header_dirs="$with_krb4_include $header_dirs"
++fi
++if test "$with_krb4_lib"; then
++	lib_dirs="$with_krb4_lib $lib_dirs"
++fi
++
++if test "$with_krb4_config" = ""; then
++	with_krb4_config='krb4-config'
++fi
++
++krb4_cflags=
++krb4_libs=
++
++case "$with_krb4_config" in
++yes|no|"")
++	;;
++*)
++	krb4_cflags="`$with_krb4_config --cflags 2>&1`"
++	krb4_libs="`$with_krb4_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_krb4" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$krb4_cflags" -a "$krb4_libs"; then
++		CFLAGS="$krb4_cflags $save_CFLAGS"
++		LIBS="$krb4_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_krb4="$krb4_cflags"
++			LIB_krb4="$krb4_libs"
++			echo "$as_me:$LINENO: result: from $with_krb4_config" >&5
++echo "${ECHO_T}from $with_krb4_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lkrb -ldes $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_krb4" != "no"; then
++			DIR_krb4=
++			INCLUDE_krb4="-I$ires"
++			LIB_krb4="-L$lres -lkrb -ldes"
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define KRB4 1
++_ACEOF
++
++	with_krb4=yes
++else
++	with_krb4=no
++	DIR_krb4=
++	INCLUDE_krb4=
++	LIB_krb4=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++
++LIB_kdb=
++if test "$with_krb4" != "no"; then
++	save_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS $INCLUDE_krb4"
++	save_LIBS="$LIBS"
++	LIBS="$LIB_krb4 $LIBS"
++	EXTRA_LIB45=lib45.a
++	
++	echo "$as_me:$LINENO: checking for four valued krb_put_int" >&5
++echo $ECHO_N "checking for four valued krb_put_int... $ECHO_C" >&6
++if test "${ac_cv_func_krb_put_int_four+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++int
++main ()
++{
++
++		char tmp[4];
++		krb_put_int(17, tmp, 4, sizeof(tmp));
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_krb_put_int_four=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_krb_put_int_four=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_krb_put_int_four" >&5
++echo "${ECHO_T}$ac_cv_func_krb_put_int_four" >&6
++	if test "$ac_cv_func_krb_put_int_four" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_FOUR_VALUED_KRB_PUT_INT 1
++_ACEOF
++
++	fi
++	
++
++	echo "$as_me:$LINENO: checking for KRB_VERIFY_SECURE" >&5
++echo $ECHO_N "checking for KRB_VERIFY_SECURE... $ECHO_C" >&6
++if test "${ac_cv_func_krb_verify_secure+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++int
++main ()
++{
++
++		int x = KRB_VERIFY_SECURE
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_krb_verify_secure=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_krb_verify_secure=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_krb_verify_secure" >&5
++echo "${ECHO_T}$ac_cv_func_krb_verify_secure" >&6
++	if test "$ac_cv_func_krb_verify_secure" != yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define KRB_VERIFY_SECURE 1
++_ACEOF
++
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define KRB_VERIFY_SECURE_FAIL 2
++_ACEOF
++
++	fi
++	echo "$as_me:$LINENO: checking for KRB_VERIFY_NOT_SECURE" >&5
++echo $ECHO_N "checking for KRB_VERIFY_NOT_SECURE... $ECHO_C" >&6
++if test "${ac_cv_func_krb_verify_not_secure+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++int
++main ()
++{
++
++		int x = KRB_VERIFY_NOT_SECURE
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_krb_verify_not_secure=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_krb_verify_not_secure=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_krb_verify_not_secure" >&5
++echo "${ECHO_T}$ac_cv_func_krb_verify_not_secure" >&6
++	if test "$ac_cv_func_krb_verify_not_secure" != yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define KRB_VERIFY_NOT_SECURE 0
++_ACEOF
++
++	fi
++	
++
++
++
++echo "$as_me:$LINENO: checking for krb_enable_debug" >&5
++echo $ECHO_N "checking for krb_enable_debug... $ECHO_C" >&6
++if test "${ac_cv_funclib_krb_enable_debug+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_krb_enable_debug\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++krb_enable_debug()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_enable_debug=$ac_lib; else ac_cv_funclib_krb_enable_debug=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_krb_enable_debug=\${ac_cv_funclib_krb_enable_debug-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_krb_enable_debug"
++
++if false; then
++	
++for ac_func in krb_enable_debug
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# krb_enable_debug
++eval "ac_tr_func=HAVE_`echo krb_enable_debug | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_krb_enable_debug=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_krb_enable_debug=yes"
++	eval "LIB_krb_enable_debug="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_krb_enable_debug=no"
++	eval "LIB_krb_enable_debug="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_krb_enable_debug=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_krb_enable_debug"; then
++	LIBS="$LIB_krb_enable_debug $LIBS"
++fi
++
++	
++
++
++
++echo "$as_me:$LINENO: checking for krb_disable_debug" >&5
++echo $ECHO_N "checking for krb_disable_debug... $ECHO_C" >&6
++if test "${ac_cv_funclib_krb_disable_debug+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_krb_disable_debug\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++krb_disable_debug()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_disable_debug=$ac_lib; else ac_cv_funclib_krb_disable_debug=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_krb_disable_debug=\${ac_cv_funclib_krb_disable_debug-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_krb_disable_debug"
++
++if false; then
++	
++for ac_func in krb_disable_debug
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# krb_disable_debug
++eval "ac_tr_func=HAVE_`echo krb_disable_debug | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_krb_disable_debug=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_krb_disable_debug=yes"
++	eval "LIB_krb_disable_debug="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_krb_disable_debug=no"
++	eval "LIB_krb_disable_debug="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_krb_disable_debug=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_krb_disable_debug"; then
++	LIBS="$LIB_krb_disable_debug $LIBS"
++fi
++
++	
++
++
++
++echo "$as_me:$LINENO: checking for krb_get_our_ip_for_realm" >&5
++echo $ECHO_N "checking for krb_get_our_ip_for_realm... $ECHO_C" >&6
++if test "${ac_cv_funclib_krb_get_our_ip_for_realm+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_krb_get_our_ip_for_realm\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++krb_get_our_ip_for_realm()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_get_our_ip_for_realm=$ac_lib; else ac_cv_funclib_krb_get_our_ip_for_realm=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_krb_get_our_ip_for_realm=\${ac_cv_funclib_krb_get_our_ip_for_realm-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_krb_get_our_ip_for_realm"
++
++if false; then
++	
++for ac_func in krb_get_our_ip_for_realm
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# krb_get_our_ip_for_realm
++eval "ac_tr_func=HAVE_`echo krb_get_our_ip_for_realm | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_krb_get_our_ip_for_realm=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_krb_get_our_ip_for_realm=yes"
++	eval "LIB_krb_get_our_ip_for_realm="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_krb_get_our_ip_for_realm=no"
++	eval "LIB_krb_get_our_ip_for_realm="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_krb_get_our_ip_for_realm=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_krb_get_our_ip_for_realm"; then
++	LIBS="$LIB_krb_get_our_ip_for_realm $LIBS"
++fi
++
++	
++
++
++
++echo "$as_me:$LINENO: checking for krb_kdctimeofday" >&5
++echo $ECHO_N "checking for krb_kdctimeofday... $ECHO_C" >&6
++if test "${ac_cv_funclib_krb_kdctimeofday+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_krb_kdctimeofday\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++krb_kdctimeofday()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_kdctimeofday=$ac_lib; else ac_cv_funclib_krb_kdctimeofday=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_krb_kdctimeofday=\${ac_cv_funclib_krb_kdctimeofday-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_krb_kdctimeofday"
++
++if false; then
++	
++for ac_func in krb_kdctimeofday
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# krb_kdctimeofday
++eval "ac_tr_func=HAVE_`echo krb_kdctimeofday | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_krb_kdctimeofday=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_krb_kdctimeofday=yes"
++	eval "LIB_krb_kdctimeofday="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_krb_kdctimeofday=no"
++	eval "LIB_krb_kdctimeofday="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_krb_kdctimeofday=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_krb_kdctimeofday"; then
++	LIBS="$LIB_krb_kdctimeofday $LIBS"
++fi
++
++	
++
++	
++
++
++
++echo "$as_me:$LINENO: checking for krb_get_kdc_time_diff" >&5
++echo $ECHO_N "checking for krb_get_kdc_time_diff... $ECHO_C" >&6
++if test "${ac_cv_funclib_krb_get_kdc_time_diff+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_krb_get_kdc_time_diff\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++krb_get_kdc_time_diff()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_get_kdc_time_diff=$ac_lib; else ac_cv_funclib_krb_get_kdc_time_diff=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_krb_get_kdc_time_diff=\${ac_cv_funclib_krb_get_kdc_time_diff-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_krb_get_kdc_time_diff"
++
++if false; then
++	
++for ac_func in krb_get_kdc_time_diff
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# krb_get_kdc_time_diff
++eval "ac_tr_func=HAVE_`echo krb_get_kdc_time_diff | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_krb_get_kdc_time_diff=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_krb_get_kdc_time_diff=yes"
++	eval "LIB_krb_get_kdc_time_diff="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_krb_get_kdc_time_diff=no"
++	eval "LIB_krb_get_kdc_time_diff="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_krb_get_kdc_time_diff=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_krb_get_kdc_time_diff"; then
++	LIBS="$LIB_krb_get_kdc_time_diff $LIBS"
++fi
++
++	
++
++	echo "$as_me:$LINENO: checking for KRB_SENDAUTH_VERS" >&5
++echo $ECHO_N "checking for KRB_SENDAUTH_VERS... $ECHO_C" >&6
++if test "${ac_cv_func_krb_sendauth_vers+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++			#include <prot.h>
++int
++main ()
++{
++
++		char *x = KRB_SENDAUTH_VERS
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_krb_sendauth_vers=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_krb_sendauth_vers=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_krb_sendauth_vers" >&5
++echo "${ECHO_T}$ac_cv_func_krb_sendauth_vers" >&6
++	if test "$ac_cv_func_krb_sendauth_vers" != yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define KRB_SENDAUTH_VERS "AUTHV0.1"
++_ACEOF
++
++	fi
++	echo "$as_me:$LINENO: checking for krb_mk_req with const arguments" >&5
++echo $ECHO_N "checking for krb_mk_req with const arguments... $ECHO_C" >&6
++if test "${ac_cv_func_krb_mk_req_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <krb.h>
++		int krb_mk_req(KTEXT a, const char *s, const char *i,
++			       const char *r, int32_t checksum)
++		{ return 17; }
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_krb_mk_req_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_krb_mk_req_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_krb_mk_req_const" >&5
++echo "${ECHO_T}$ac_cv_func_krb_mk_req_const" >&6
++	if test "$ac_cv_func_krb_mk_req_const" = "yes"; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define KRB_MK_REQ_CONST 1
++_ACEOF
++
++	fi
++
++	LIBS="$save_LIBS"
++	CFLAGS="$save_CFLAGS"
++	LIB_kdb="-lkdb -lkrb"
++fi
++
++
++if test "$with_krb4" != "no"; then
++  KRB4_TRUE=
++  KRB4_FALSE='#'
++else
++  KRB4_TRUE='#'
++  KRB4_FALSE=
++fi
++
++
++
++if true; then
++  KRB5_TRUE=
++  KRB5_FALSE='#'
++else
++  KRB5_TRUE='#'
++  KRB5_FALSE=
++fi
++
++
++
++if true; then
++  do_roken_rename_TRUE=
++  do_roken_rename_FALSE='#'
++else
++  do_roken_rename_TRUE='#'
++  do_roken_rename_FALSE=
++fi
++
++
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define KRB5 1
++_ACEOF
++
++
++crypto_lib=unknown
++
++
++# Check whether --with-openssl or --without-openssl was given.
++if test "${with_openssl+set}" = set; then
++  withval="$with_openssl"
++  
++fi; 
++
++
++# Check whether --with-openssl-lib or --without-openssl-lib was given.
++if test "${with_openssl_lib+set}" = set; then
++  withval="$with_openssl_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-openssl-lib" >&5
++echo "$as_me: error: No argument for --with-openssl-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_openssl" = "X"; then
++  with_openssl=yes
++fi
++fi; 
++
++
++# Check whether --with-openssl-include or --without-openssl-include was given.
++if test "${with_openssl_include+set}" = set; then
++  withval="$with_openssl_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-openssl-include" >&5
++echo "$as_me: error: No argument for --with-openssl-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_openssl" = "X"; then
++  with_openssl=yes
++fi
++fi; 
++
++case "$with_openssl" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_openssl_include" = ""; then
++		with_openssl_include="$with_openssl/include"
++	fi
++	if test "$with_openssl_lib" = ""; then
++		with_openssl_lib="$with_openssl/lib$abilibdirext"
++	fi
++	;;
++esac
++
++
++DIR_des=
++
++echo "$as_me:$LINENO: checking for crypto library" >&5
++echo $ECHO_N "checking for crypto library... $ECHO_C" >&6
++
++openssl=no
++old_hash=no
++
++if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
++	save_CPPFLAGS="$CPPFLAGS"
++	save_LIBS="$LIBS"
++
++	cdirs= clibs=
++	for i in $LIB_krb4; do
++		case "$i" in
++		-L*) cdirs="$cdirs $i";;
++		-l*) clibs="$clibs $i";;
++		esac
++	done
++
++	ires=
++	for i in $INCLUDE_krb4; do
++		CFLAGS="-DHAVE_OPENSSL $i $save_CFLAGS"
++		for j in $cdirs; do
++			for k in $clibs; do
++				LIBS="$j $k $save_LIBS"
++				cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++		#undef KRB5 /* makes md4.h et al unhappy */
++		#ifdef HAVE_OPENSSL
++		#include <openssl/md4.h>
++		#include <openssl/md5.h>
++		#include <openssl/sha.h>
++		#define OPENSSL_DES_LIBDES_COMPATIBILITY
++		#include <openssl/des.h>
++		#include <openssl/rc4.h>
++		#include <openssl/rand.h>
++		#else
++		#include <md4.h>
++		#include <md5.h>
++		#include <sha.h>
++		#include <des.h>
++		#include <rc4.h>
++		#endif
++		#ifdef OLD_HASH_NAMES
++		typedef struct md4 MD4_CTX;
++		#define MD4_Init(C) md4_init((C))
++		#define MD4_Update(C, D, L) md4_update((C), (D), (L))
++		#define MD4_Final(D, C) md4_finito((C), (D))
++		typedef struct md5 MD5_CTX;
++		#define MD5_Init(C) md5_init((C))
++		#define MD5_Update(C, D, L) md5_update((C), (D), (L))
++		#define MD5_Final(D, C) md5_finito((C), (D))
++		typedef struct sha SHA_CTX;
++		#define SHA1_Init(C) sha_init((C))
++		#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
++		#define SHA1_Final(D, C) sha_finito((C), (D))
++		#endif
++		
++int
++main ()
++{
++
++		void *schedule = 0;
++		MD4_CTX md4;
++		MD5_CTX md5;
++		SHA_CTX sha1;
++
++		MD4_Init(&md4);
++		MD5_Init(&md5);
++		SHA1_Init(&sha1);
++		#ifdef HAVE_OPENSSL
++		RAND_status();
++		#endif
++
++		des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
++		RC4(0, 0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  openssl=yes ires="$i" lres="$j $k"; break 3
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++			done
++		done
++		CFLAGS="$i $save_CFLAGS"
++		for j in $cdirs; do
++			for k in $clibs; do
++				LIBS="$j $k $save_LIBS"
++				cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++		#undef KRB5 /* makes md4.h et al unhappy */
++		#ifdef HAVE_OPENSSL
++		#include <openssl/md4.h>
++		#include <openssl/md5.h>
++		#include <openssl/sha.h>
++		#define OPENSSL_DES_LIBDES_COMPATIBILITY
++		#include <openssl/des.h>
++		#include <openssl/rc4.h>
++		#include <openssl/rand.h>
++		#else
++		#include <md4.h>
++		#include <md5.h>
++		#include <sha.h>
++		#include <des.h>
++		#include <rc4.h>
++		#endif
++		#ifdef OLD_HASH_NAMES
++		typedef struct md4 MD4_CTX;
++		#define MD4_Init(C) md4_init((C))
++		#define MD4_Update(C, D, L) md4_update((C), (D), (L))
++		#define MD4_Final(D, C) md4_finito((C), (D))
++		typedef struct md5 MD5_CTX;
++		#define MD5_Init(C) md5_init((C))
++		#define MD5_Update(C, D, L) md5_update((C), (D), (L))
++		#define MD5_Final(D, C) md5_finito((C), (D))
++		typedef struct sha SHA_CTX;
++		#define SHA1_Init(C) sha_init((C))
++		#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
++		#define SHA1_Final(D, C) sha_finito((C), (D))
++		#endif
++		
++int
++main ()
++{
++
++		void *schedule = 0;
++		MD4_CTX md4;
++		MD5_CTX md5;
++		SHA_CTX sha1;
++
++		MD4_Init(&md4);
++		MD5_Init(&md5);
++		SHA1_Init(&sha1);
++		#ifdef HAVE_OPENSSL
++		RAND_status();
++		#endif
++
++		des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
++		RC4(0, 0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  openssl=no ires="$i" lres="$j $k"; break 3
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++			done
++		done
++		CFLAGS="-DHAVE_OLD_HASH_NAMES $i $save_CFLAGS"
++		for j in $cdirs; do
++			for k in $clibs; do
++				LIBS="$j $k $save_LIBS"
++				cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++		#undef KRB5 /* makes md4.h et al unhappy */
++		#ifdef HAVE_OPENSSL
++		#include <openssl/md4.h>
++		#include <openssl/md5.h>
++		#include <openssl/sha.h>
++		#define OPENSSL_DES_LIBDES_COMPATIBILITY
++		#include <openssl/des.h>
++		#include <openssl/rc4.h>
++		#include <openssl/rand.h>
++		#else
++		#include <md4.h>
++		#include <md5.h>
++		#include <sha.h>
++		#include <des.h>
++		#include <rc4.h>
++		#endif
++		#ifdef OLD_HASH_NAMES
++		typedef struct md4 MD4_CTX;
++		#define MD4_Init(C) md4_init((C))
++		#define MD4_Update(C, D, L) md4_update((C), (D), (L))
++		#define MD4_Final(D, C) md4_finito((C), (D))
++		typedef struct md5 MD5_CTX;
++		#define MD5_Init(C) md5_init((C))
++		#define MD5_Update(C, D, L) md5_update((C), (D), (L))
++		#define MD5_Final(D, C) md5_finito((C), (D))
++		typedef struct sha SHA_CTX;
++		#define SHA1_Init(C) sha_init((C))
++		#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
++		#define SHA1_Final(D, C) sha_finito((C), (D))
++		#endif
++		
++int
++main ()
++{
++
++		void *schedule = 0;
++		MD4_CTX md4;
++		MD5_CTX md5;
++		SHA_CTX sha1;
++
++		MD4_Init(&md4);
++		MD5_Init(&md5);
++		SHA1_Init(&sha1);
++		#ifdef HAVE_OPENSSL
++		RAND_status();
++		#endif
++
++		des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
++		RC4(0, 0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  openssl=no ires="$i" lres="$j $k"; break 3
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++			done
++		done
++	done
++		
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++	if test "$ires" -a "$lres"; then
++		INCLUDE_des="$ires"
++		LIB_des="$lres"
++		crypto_lib=krb4
++		echo "$as_me:$LINENO: result: same as krb4" >&5
++echo "${ECHO_T}same as krb4" >&6
++		LIB_des_a='$(LIB_des)'
++		LIB_des_so='$(LIB_des)'
++		LIB_des_appl='$(LIB_des)'
++	fi
++fi
++
++if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	INCLUDE_des=
++	LIB_des=
++	if test "$with_openssl_include" != ""; then
++		INCLUDE_des="-I${with_openssl_include}"
++	fi
++	if test "$with_openssl_lib" != ""; then
++		LIB_des="-L${with_openssl_lib}"
++	fi
++	CFLAGS="-DHAVE_OPENSSL ${INCLUDE_des} ${CFLAGS}"
++	saved_LIB_des="$LIB_des"
++	for lres in "" "-lnsl -lsocket"; do
++		LIB_des="${saved_LIB_des} -lcrypto $lres"
++		LIB_des_a="$LIB_des"
++		LIB_des_so="$LIB_des"
++		LIB_des_appl="$LIB_des"
++		LIBS="${LIBS} ${LIB_des}"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++		#undef KRB5 /* makes md4.h et al unhappy */
++		#ifdef HAVE_OPENSSL
++		#include <openssl/md4.h>
++		#include <openssl/md5.h>
++		#include <openssl/sha.h>
++		#define OPENSSL_DES_LIBDES_COMPATIBILITY
++		#include <openssl/des.h>
++		#include <openssl/rc4.h>
++		#include <openssl/rand.h>
++		#else
++		#include <md4.h>
++		#include <md5.h>
++		#include <sha.h>
++		#include <des.h>
++		#include <rc4.h>
++		#endif
++		#ifdef OLD_HASH_NAMES
++		typedef struct md4 MD4_CTX;
++		#define MD4_Init(C) md4_init((C))
++		#define MD4_Update(C, D, L) md4_update((C), (D), (L))
++		#define MD4_Final(D, C) md4_finito((C), (D))
++		typedef struct md5 MD5_CTX;
++		#define MD5_Init(C) md5_init((C))
++		#define MD5_Update(C, D, L) md5_update((C), (D), (L))
++		#define MD5_Final(D, C) md5_finito((C), (D))
++		typedef struct sha SHA_CTX;
++		#define SHA1_Init(C) sha_init((C))
++		#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
++		#define SHA1_Final(D, C) sha_finito((C), (D))
++		#endif
++		
++int
++main ()
++{
++
++		void *schedule = 0;
++		MD4_CTX md4;
++		MD5_CTX md5;
++		SHA_CTX sha1;
++
++		MD4_Init(&md4);
++		MD5_Init(&md5);
++		SHA1_Init(&sha1);
++		#ifdef HAVE_OPENSSL
++		RAND_status();
++		#endif
++
++		des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
++		RC4(0, 0, 0, 0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			crypto_lib=libcrypto openssl=yes
++			echo "$as_me:$LINENO: result: libcrypto" >&5
++echo "${ECHO_T}libcrypto" >&6
++		
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		if test "$crypto_lib" = libcrypto ; then
++			break;
++		fi
++	done
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$crypto_lib" = "unknown"; then
++
++  DIR_des='des'
++  LIB_des='$(top_builddir)/lib/des/libdes.la'
++  LIB_des_a='$(top_builddir)/lib/des/.libs/libdes.a'
++  LIB_des_so='$(top_builddir)/lib/des/.libs/libdes.so'
++  LIB_des_appl="-ldes"
++
++  echo "$as_me:$LINENO: result: included libdes" >&5
++echo "${ECHO_T}included libdes" >&6
++
++fi
++
++if test "$with_krb4" != no -a "$crypto_lib" != krb4; then
++	{ { echo "$as_me:$LINENO: error: the crypto library used by krb4 lacks features
++required by Kerberos 5; to continue, you need to install a newer 
++Kerberos 4 or configure --without-krb4" >&5
++echo "$as_me: error: the crypto library used by krb4 lacks features
++required by Kerberos 5; to continue, you need to install a newer 
++Kerberos 4 or configure --without-krb4" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++if test "$openssl" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OPENSSL 1
++_ACEOF
++
++fi
++if test "$old_hash" = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OLD_HASH_NAMES 1
++_ACEOF
++
++fi
++
++
++if test "$openssl" = yes; then
++  HAVE_OPENSSL_TRUE=
++  HAVE_OPENSSL_FALSE='#'
++else
++  HAVE_OPENSSL_TRUE='#'
++  HAVE_OPENSSL_FALSE=
++fi
++
++
++
++
++
++
++
++
++
++# Check whether --enable-dce or --disable-dce was given.
++if test "${enable_dce+set}" = set; then
++  enableval="$enable_dce"
++  
++fi; 
++if test "$enable_dce" = yes; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define DCE 1
++_ACEOF
++
++fi
++
++
++if test "$enable_dce" = yes; then
++  DCE_TRUE=
++  DCE_FALSE='#'
++else
++  DCE_TRUE='#'
++  DCE_FALSE=
++fi
++
++
++## XXX quite horrible:
++if test -f /etc/ibmcxx.cfg; then
++	dpagaix_ldadd=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/libraries/{;s/^[^=]*=\(.*\)/\1/;s/,/ /gp;}'`
++	dpagaix_cflags=`sed -n '/^xlc_r4/,/^$/p' /etc/ibmcxx.cfg | sed -n -e '/options/{;s/^[^=]*=\(.*\)/\1/;s/-q^,*//;s/,/ /gp;}'`
++	dpagaix_ldflags=
++else
++	dpagaix_cflags="-D_THREAD_SAFE -D_AIX_PTHREADS_D7 -D_AIX32_THREADS=1 -D_AES_SOURCE -D_AIX41 -I/usr/include/dce"
++	dpagaix_ldadd="-L/usr/lib/threads -ldcelibc_r -ldcepthreads -lpthreads_compat lpthreads -lc_r"
++	dpagaix_ldflags="-Wl,-bI:dfspag.exp"
++fi
++
++
++
++
++
++# Check whether --enable-berkeley-db or --disable-berkeley-db was given.
++if test "${enable_berkeley_db+set}" = set; then
++  enableval="$enable_berkeley_db"
++  
++
++fi; 
++
++have_ndbm=no
++db_type=unknown
++
++if test "$enable_berkeley_db" != no; then
++
++  
++
++
++
++for ac_header in 				\
++	db4/db.h				\
++	db3/db.h				\
++	db.h					\
++	db_185.h				\
++  
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++  
++
++
++echo "$as_me:$LINENO: checking for db_create" >&5
++echo $ECHO_N "checking for db_create... $ECHO_C" >&6
++if test "${ac_cv_funclib_db_create+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_db_create\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" db4 db3 db; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++  #include <stdio.h>
++  #ifdef HAVE_DB4_DB_H
++  #include <db4/db.h>
++  #elif defined(HAVE_DB3_DB_H)
++  #include <db3/db.h>
++  #else
++  #include <db.h>
++  #endif
++  
++int
++main ()
++{
++db_create(NULL, NULL, 0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_db_create=$ac_lib; else ac_cv_funclib_db_create=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_db_create=\${ac_cv_funclib_db_create-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_db_create"
++
++if false; then
++	
++for ac_func in db_create
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# db_create
++eval "ac_tr_func=HAVE_`echo db_create | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_db_create=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_db_create=yes"
++	eval "LIB_db_create="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_db_create=no"
++	eval "LIB_db_create="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_db_create=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++  if test "$ac_cv_func_db_create" = "yes"; then
++    db_type=db3
++    if test "$ac_cv_funclib_db_create" != "yes"; then
++      DBLIB="$ac_cv_funclib_db_create"
++    else
++      DBLIB=""
++    fi
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DB3 1
++_ACEOF
++
++  else
++
++
++    
++
++
++echo "$as_me:$LINENO: checking for dbopen" >&5
++echo $ECHO_N "checking for dbopen... $ECHO_C" >&6
++if test "${ac_cv_funclib_dbopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_dbopen\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" db2 db; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++    #include <stdio.h>
++    #if defined(HAVE_DB2_DB_H)
++    #include <db2/db.h>
++    #elif defined(HAVE_DB_185_H)
++    #include <db_185.h>
++    #elif defined(HAVE_DB_H)
++    #include <db.h>
++    #else
++    #error no db.h
++    #endif
++    
++int
++main ()
++{
++dbopen(NULL, 0, 0, 0, NULL)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbopen=$ac_lib; else ac_cv_funclib_dbopen=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_dbopen=\${ac_cv_funclib_dbopen-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_dbopen"
++
++if false; then
++	
++for ac_func in dbopen
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# dbopen
++eval "ac_tr_func=HAVE_`echo dbopen | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_dbopen=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_dbopen=yes"
++	eval "LIB_dbopen="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_dbopen=no"
++	eval "LIB_dbopen="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_dbopen=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++    if test "$ac_cv_func_dbopen" = "yes"; then
++      db_type=db1
++      if test "$ac_cv_funclib_dbopen" != "yes"; then
++        DBLIB="$ac_cv_funclib_dbopen"
++      else
++        DBLIB=""
++      fi
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DB1 1
++_ACEOF
++
++    fi
++  fi
++
++
++  if test "$ac_cv_func_dbm_firstkey" != yes; then
++    
++
++echo "$as_me:$LINENO: checking for dbm_firstkey" >&5
++echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
++if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in $ac_cv_funclib_dbopen $ac_cv_funclib_db_create; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++    #include <stdio.h>
++    #define DB_DBM_HSEARCH 1
++    #include <db.h>
++    DBM *dbm;
++    
++int
++main ()
++{
++dbm_firstkey(NULL)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
++
++if false; then
++	
++for ac_func in dbm_firstkey
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# dbm_firstkey
++eval "ac_tr_func=HAVE_`echo dbm_firstkey | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_dbm_firstkey=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_dbm_firstkey=yes"
++	eval "LIB_dbm_firstkey="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_dbm_firstkey=no"
++	eval "LIB_dbm_firstkey="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_dbm_firstkey=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++  
++    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
++      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
++        LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
++      else
++        LIB_NDBM=""
++      fi
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_DB_NDBM 1
++_ACEOF
++
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NEW_DB 1
++_ACEOF
++
++    else
++      $as_unset ac_cv_func_dbm_firstkey
++      $as_unset ac_cv_funclib_dbm_firstkey
++    fi
++  fi
++
++fi # berkeley db
++
++if test "$db_type" = "unknown" -o "$ac_cv_func_dbm_firstkey" = ""; then
++
++  
++
++for ac_header in 				\
++	dbm.h					\
++	ndbm.h					\
++  
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++  
++
++
++echo "$as_me:$LINENO: checking for dbm_firstkey" >&5
++echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
++if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ndbm; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++  #include <stdio.h>
++  #if defined(HAVE_NDBM_H)
++  #include <ndbm.h>
++  #elif defined(HAVE_DBM_H)
++  #include <dbm.h>
++  #endif
++  DBM *dbm;
++  
++int
++main ()
++{
++dbm_firstkey(NULL)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
++
++if false; then
++	
++for ac_func in dbm_firstkey
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# dbm_firstkey
++eval "ac_tr_func=HAVE_`echo dbm_firstkey | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_dbm_firstkey=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_dbm_firstkey=yes"
++	eval "LIB_dbm_firstkey="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_dbm_firstkey=no"
++	eval "LIB_dbm_firstkey="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_dbm_firstkey=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++  if test "$ac_cv_func_dbm_firstkey" = "yes"; then
++    if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
++      LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
++    else
++      LIB_NDBM=""
++    fi
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NDBM 1
++_ACEOF
++    have_ndbm=yes
++    if test "$db_type" = "unknown"; then
++      db_type=ndbm
++      DBLIB="$LIB_NDBM"
++    fi
++  else
++
++    $as_unset ac_cv_func_dbm_firstkey
++    $as_unset ac_cv_funclib_dbm_firstkey
++
++    
++for ac_header in 				\
++	  gdbm/ndbm.h				\
++    
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++    
++
++
++echo "$as_me:$LINENO: checking for dbm_firstkey" >&5
++echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
++if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_dbm_firstkey\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" gdbm; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++    #include <stdio.h>
++    #include <gdbm/ndbm.h>
++    DBM *dbm;
++    
++int
++main ()
++{
++dbm_firstkey(NULL)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
++
++if false; then
++	
++for ac_func in dbm_firstkey
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# dbm_firstkey
++eval "ac_tr_func=HAVE_`echo dbm_firstkey | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_dbm_firstkey=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_dbm_firstkey=yes"
++	eval "LIB_dbm_firstkey="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_dbm_firstkey=no"
++	eval "LIB_dbm_firstkey="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_dbm_firstkey=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++    if test "$ac_cv_func_dbm_firstkey" = "yes"; then
++      if test "$ac_cv_funclib_dbm_firstkey" != "yes"; then
++	LIB_NDBM="$ac_cv_funclib_dbm_firstkey"
++      else
++	LIB_NDBM=""
++      fi
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NDBM 1
++_ACEOF
++      have_ndbm=yes
++      if test "$db_type" = "unknown"; then
++	db_type=ndbm
++	DBLIB="$LIB_NDBM"
++      fi
++    fi
++  fi
++
++fi # unknown
++
++if test "$have_ndbm" = "yes"; then
++  echo "$as_me:$LINENO: checking if ndbm is implemented with db" >&5
++echo $ECHO_N "checking if ndbm is implemented with db... $ECHO_C" >&6
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <unistd.h>
++#include <fcntl.h>
++#if defined(HAVE_GDBM_NDBM_H)
++#include <gdbm/ndbm.h>
++#elif defined(HAVE_NDBM_H)
++#include <ndbm.h>
++#elif defined(HAVE_DBM_H)
++#include <dbm.h>
++#endif
++int main()
++{
++  DBM *d;
++
++  d = dbm_open("conftest", O_RDWR | O_CREAT, 0666);
++  if (d == NULL)
++    return 1;
++  dbm_close(d);
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++    if test -f conftest.db; then
++      echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++      
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NEW_DB 1
++_ACEOF
++
++    else
++      echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    fi
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++
++
++
++if test "$db_type" = db1; then
++  HAVE_DB1_TRUE=
++  HAVE_DB1_FALSE='#'
++else
++  HAVE_DB1_TRUE='#'
++  HAVE_DB1_FALSE=
++fi
++
++
++if test "$db_type" = db3; then
++  HAVE_DB3_TRUE=
++  HAVE_DB3_FALSE='#'
++else
++  HAVE_DB3_TRUE='#'
++  HAVE_DB3_FALSE=
++fi
++
++
++if test "$db_type" = ndbm; then
++  HAVE_NDBM_TRUE=
++  HAVE_NDBM_FALSE='#'
++else
++  HAVE_NDBM_TRUE='#'
++  HAVE_NDBM_FALSE=
++fi
++
++z=""
++for i in $LDFLAGS; do
++	case "$i" in
++	-L*) z="$z $i";;
++	esac
++done
++DBLIB="$z $DBLIB"
++
++
++
++
++
++# Check whether --with-roken or --without-roken was given.
++if test "${with_roken+set}" = set; then
++  withval="$with_roken"
++  if test "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: roken is required" >&5
++echo "$as_me: error: roken is required" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi; 
++
++save_CPPFLAGS="${CPPFLAGS}"
++
++case $with_roken in
++yes|"")
++  dirs="/usr/heimdal /usr/athena" ;;
++*)
++  dirs="$with_roken" ;;
++esac
++
++roken_installed=no
++
++for i in $dirs; do
++
++echo "$as_me:$LINENO: checking for roken in $i" >&5
++echo $ECHO_N "checking for roken in $i... $ECHO_C" >&6
++
++CPPFLAGS="-I$i/include ${CPPFLAGS}"
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <roken.h>
++//#if ROKEN_VERSION < 10
++//#error old roken version, should be 10
++//fail
++//#endif
++
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  roken_installed=yes; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  
++fi
++rm -f conftest.err conftest.$ac_ext
++
++echo "$as_me:$LINENO: result: $roken_installed" >&5
++echo "${ECHO_T}$roken_installed" >&6
++
++done
++
++CPPFLAGS="$save_CPPFLAGS"
++
++if test "$roken_installed" != "yes"; then
++  DIR_roken="roken"
++  LIB_roken='$(top_builddir)/lib/roken/libroken.la'
++  CPPFLAGS_roken='-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken'
++else
++  LIB_roken="$i/lib/libroken.la"
++  CPPFLAGS_roken="-I$i/include"
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for crypt" >&5
++echo $ECHO_N "checking for crypt... $ECHO_C" >&6
++if test "${ac_cv_funclib_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_crypt\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" crypt; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++crypt()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_crypt=\${ac_cv_funclib_crypt-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_crypt"
++
++if false; then
++	
++for ac_func in crypt
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# crypt
++eval "ac_tr_func=HAVE_`echo crypt | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_crypt=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_crypt=yes"
++	eval "LIB_crypt="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_crypt=no"
++	eval "LIB_crypt="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_crypt=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++
++
++#if ! test "$roken_installed" = yes; then
++	
++
++echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6
++if test "${ac_cv_c_inline+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_inline=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
++if test $ac_cv_c_const = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define const 
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++if test "${ac_cv_type_size_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((size_t *) 0)
++  return 0;
++if (sizeof (size_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_size_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_size_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6
++if test $ac_cv_type_size_t = yes; then
++  :
++else
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define size_t unsigned
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for pid_t" >&5
++echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
++if test "${ac_cv_type_pid_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((pid_t *) 0)
++  return 0;
++if (sizeof (pid_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_pid_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_pid_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
++echo "${ECHO_T}$ac_cv_type_pid_t" >&6
++if test $ac_cv_type_pid_t = yes; then
++  :
++else
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define pid_t int
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
++echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
++if test "${ac_cv_type_uid_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "uid_t" >/dev/null 2>&1; then
++  ac_cv_type_uid_t=yes
++else
++  ac_cv_type_uid_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
++echo "${ECHO_T}$ac_cv_type_uid_t" >&6
++if test $ac_cv_type_uid_t = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define uid_t int
++_ACEOF
++
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define gid_t int
++_ACEOF
++
++fi
++
++
++echo "$as_me:$LINENO: checking return type of signal handlers" >&5
++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
++if test "${ac_cv_type_signal+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <signal.h>
++#ifdef signal
++# undef signal
++#endif
++#ifdef __cplusplus
++extern "C" void (*signal (int, void (*)(int)))(int);
++#else
++void (*signal ()) ();
++#endif
++
++int
++main ()
++{
++int i;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_signal=void
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_signal=int
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
++echo "${ECHO_T}$ac_cv_type_signal" >&6
++
++cat >>confdefs.h <<_ACEOF
++@%:@define RETSIGTYPE $ac_cv_type_signal
++_ACEOF
++
++
++if test "$ac_cv_type_signal" = "void" ; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define VOID_RETSIGTYPE 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++if test "${ac_cv_header_time+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
++
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_time=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_time=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6
++if test $ac_cv_header_time = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TIME_WITH_SYS_TIME 1
++_ACEOF
++
++fi
++
++
++
++for ac_header in standards.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++for i in netinet/ip.h netinet/tcp.h; do
++
++cv=`echo "$i" | sed 'y%./+-%__p_%'`
++
++echo "$as_me:$LINENO: checking for $i" >&5
++echo $ECHO_N "checking for $i... $ECHO_C" >&6
++if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++\
++#ifdef HAVE_STANDARDS_H
++#include <standards.h>
++#endif
++#include <$i>
++
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  eval "ac_cv_header_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  eval "ac_cv_header_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
++ac_res=`eval echo \\$ac_cv_header_$cv`
++if test "$ac_res" = yes; then
++	ac_tr_hdr=HAVE_`echo $i | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++done
++if false;then
++	
++
++for ac_header in netinet/ip.h netinet/tcp.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++fi
++
++
++
++
++for ac_func in getlogin setlogin
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++if test "$ac_cv_func_getlogin" = yes; then
++echo "$as_me:$LINENO: checking if getlogin is posix" >&5
++echo $ECHO_N "checking if getlogin is posix... $ECHO_C" >&6
++if test "${ac_cv_func_getlogin_posix+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if test "$ac_cv_func_getlogin" = yes -a "$ac_cv_func_setlogin" = yes; then
++	ac_cv_func_getlogin_posix=no
++else
++	ac_cv_func_getlogin_posix=yes
++fi
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getlogin_posix" >&5
++echo "${ECHO_T}$ac_cv_func_getlogin_posix" >&6
++if test "$ac_cv_func_getlogin_posix" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define POSIX_GETLOGIN 1
++_ACEOF
++
++fi
++fi
++
++
++
++for ac_header in stdlib.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++for ac_func in getpagesize
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  ac_cv_func_mmap_fixed_mapped=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++/* malloc might have been renamed as rpl_malloc. */
++#undef malloc
++
++/* Thanks to Mike Haertel and Jim Avera for this test.
++   Here is a matrix of mmap possibilities:
++	mmap private not fixed
++	mmap private fixed at somewhere currently unmapped
++	mmap private fixed at somewhere already mapped
++	mmap shared not fixed
++	mmap shared fixed at somewhere currently unmapped
++	mmap shared fixed at somewhere already mapped
++   For private mappings, we should verify that changes cannot be read()
++   back from the file, nor mmap's back from the file at a different
++   address.  (There have been systems where private was not correctly
++   implemented like the infamous i386 svr4.0, and systems where the
++   VM page cache was not coherent with the file system buffer cache
++   like early versions of FreeBSD and possibly contemporary NetBSD.)
++   For shared mappings, we should conversely verify that changes get
++   propagated back to all the places they're supposed to be.
++
++   Grep wants private fixed already mapped.
++   The main things grep needs to know about mmap are:
++   * does it exist and is it safe to write into the mmap'd area
++   * how to use it (BSD variants)  */
++
++#include <fcntl.h>
++#include <sys/mman.h>
++
++#if !STDC_HEADERS && !HAVE_STDLIB_H
++char *malloc ();
++#endif
++
++/* This mess was copied from the GNU getpagesize.h.  */
++#if !HAVE_GETPAGESIZE
++/* Assume that all systems that can run configure have sys/param.h.  */
++# if !HAVE_SYS_PARAM_H
++#  define HAVE_SYS_PARAM_H 1
++# endif
++
++# ifdef _SC_PAGESIZE
++#  define getpagesize() sysconf(_SC_PAGESIZE)
++# else /* no _SC_PAGESIZE */
++#  if HAVE_SYS_PARAM_H
++#   include <sys/param.h>
++#   ifdef EXEC_PAGESIZE
++#    define getpagesize() EXEC_PAGESIZE
++#   else /* no EXEC_PAGESIZE */
++#    ifdef NBPG
++#     define getpagesize() NBPG * CLSIZE
++#     ifndef CLSIZE
++#      define CLSIZE 1
++#     endif /* no CLSIZE */
++#    else /* no NBPG */
++#     ifdef NBPC
++#      define getpagesize() NBPC
++#     else /* no NBPC */
++#      ifdef PAGESIZE
++#       define getpagesize() PAGESIZE
++#      endif /* PAGESIZE */
++#     endif /* no NBPC */
++#    endif /* no NBPG */
++#   endif /* no EXEC_PAGESIZE */
++#  else /* no HAVE_SYS_PARAM_H */
++#   define getpagesize() 8192	/* punt totally */
++#  endif /* no HAVE_SYS_PARAM_H */
++# endif /* no _SC_PAGESIZE */
++
++#endif /* no HAVE_GETPAGESIZE */
++
++int
++main ()
++{
++  char *data, *data2, *data3;
++  int i, pagesize;
++  int fd;
++
++  pagesize = getpagesize ();
++
++  /* First, make a file with some known garbage in it. */
++  data = (char *) malloc (pagesize);
++  if (!data)
++    exit (1);
++  for (i = 0; i < pagesize; ++i)
++    *(data + i) = rand ();
++  umask (0);
++  fd = creat ("conftest.mmap", 0600);
++  if (fd < 0)
++    exit (1);
++  if (write (fd, data, pagesize) != pagesize)
++    exit (1);
++  close (fd);
++
++  /* Next, try to mmap the file at a fixed address which already has
++     something else allocated at it.  If we can, also make sure that
++     we see the same garbage.  */
++  fd = open ("conftest.mmap", O_RDWR);
++  if (fd < 0)
++    exit (1);
++  data2 = (char *) malloc (2 * pagesize);
++  if (!data2)
++    exit (1);
++  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
++  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
++		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
++    exit (1);
++  for (i = 0; i < pagesize; ++i)
++    if (*(data + i) != *(data2 + i))
++      exit (1);
++
++  /* Finally, make sure that changes to the mapped area do not
++     percolate back to the file as seen by read().  (This is a bug on
++     some variants of i386 svr4.0.)  */
++  for (i = 0; i < pagesize; ++i)
++    *(data2 + i) = *(data2 + i) + 1;
++  data3 = (char *) malloc (pagesize);
++  if (!data3)
++    exit (1);
++  if (read (fd, data3, pagesize) != pagesize)
++    exit (1);
++  for (i = 0; i < pagesize; ++i)
++    if (*(data + i) != *(data3 + i))
++      exit (1);
++  close (fd);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mmap_fixed_mapped=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_mmap_fixed_mapped=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
++if test $ac_cv_func_mmap_fixed_mapped = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_MMAP 1
++_ACEOF
++
++fi
++rm -f conftest.mmap
++
++
++echo "$as_me:$LINENO: checking if realloc if broken" >&5
++echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
++if test "${ac_cv_func_realloc_broken+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++ac_cv_func_realloc_broken=no
++if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stddef.h>
++#include <stdlib.h>
++
++int main()
++{
++	return realloc(NULL, 17) == NULL;
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_realloc_broken=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_realloc_broken" >&5
++echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
++if test "$ac_cv_func_realloc_broken" = yes ; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define BROKEN_REALLOC 1
++_ACEOF
++
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++WFLAGS_NOUNUSED=""
++WFLAGS_NOIMPLICITINT=""
++if test -z "$WFLAGS" -a "$GCC" = "yes"; then
++  # -Wno-implicit-int for broken X11 headers
++  # leave these out for now:
++  #   -Wcast-align doesn't work well on alpha osf/1
++  #   -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast
++  #   -Wmissing-declarations -Wnested-externs
++  WFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs"
++  WFLAGS_NOUNUSED="-Wno-unused"
++  WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
++fi
++
++
++
++
++
++
++
++
++cv=`echo "ssize_t" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for ssize_t" >&5
++echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <unistd.h>
++int
++main ()
++{
++ssize_t foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo ssize_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for ssize_t" >&5
++echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
++if test "${ac_cv_type_ssize_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((ssize_t *) 0)
++  return 0;
++if (sizeof (ssize_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_ssize_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_ssize_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
++echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
++if test $ac_cv_type_ssize_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SSIZE_T 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++
++
++cv=`echo "long long" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++
++int
++main ()
++{
++long long foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6
++if test "${ac_cv_type_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long long *) 0)
++  return 0;
++if (sizeof (long long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6
++if test $ac_cv_type_long_long = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LONG_LONG 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++for ac_header in \
++	arpa/inet.h				\
++	arpa/nameser.h				\
++	config.h				\
++	crypt.h					\
++	dirent.h				\
++	errno.h					\
++	err.h					\
++	fcntl.h					\
++	grp.h					\
++	ifaddrs.h				\
++	net/if.h				\
++	netdb.h					\
++	netinet/in.h				\
++	netinet/in6.h				\
++	netinet/in_systm.h			\
++	netinet6/in6.h				\
++	netinet6/in6_var.h			\
++	paths.h					\
++	pwd.h					\
++	resolv.h				\
++	rpcsvc/ypclnt.h				\
++	shadow.h				\
++	sys/bswap.h				\
++	sys/ioctl.h				\
++	sys/mman.h				\
++	sys/param.h				\
++	sys/proc.h				\
++	sys/resource.h				\
++	sys/socket.h				\
++	sys/sockio.h				\
++	sys/stat.h				\
++	sys/sysctl.h				\
++	sys/time.h				\
++	sys/tty.h				\
++	sys/types.h				\
++	sys/uio.h				\
++	sys/utsname.h				\
++	sys/wait.h				\
++	syslog.h				\
++	termios.h				\
++	unistd.h				\
++	userconf.h				\
++	usersec.h				\
++	util.h					\
++	vis.h					\
++
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++	
++
++
++
++
++if test "$ac_cv_header_err_h" = yes; then
++  have_err_h_TRUE=
++  have_err_h_FALSE='#'
++else
++  have_err_h_TRUE='#'
++  have_err_h_FALSE=
++fi
++
++
++
++if test "$ac_cv_header_fnmatch_h" = yes; then
++  have_fnmatch_h_TRUE=
++  have_fnmatch_h_FALSE='#'
++else
++  have_fnmatch_h_TRUE='#'
++  have_fnmatch_h_FALSE=
++fi
++
++
++
++if test "$ac_cv_header_ifaddrs_h" = yes; then
++  have_ifaddrs_h_TRUE=
++  have_ifaddrs_h_FALSE='#'
++else
++  have_ifaddrs_h_TRUE='#'
++  have_ifaddrs_h_FALSE=
++fi
++
++
++
++if test "$ac_cv_header_vis_h" = yes; then
++  have_vis_h_TRUE=
++  have_vis_h_FALSE='#'
++else
++  have_vis_h_TRUE='#'
++  have_vis_h_FALSE=
++fi
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for socket" >&5
++echo $ECHO_N "checking for socket... $ECHO_C" >&6
++if test "${ac_cv_funclib_socket+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_socket\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" socket; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++socket()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_socket"
++
++if false; then
++	
++for ac_func in socket
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# socket
++eval "ac_tr_func=HAVE_`echo socket | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_socket=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_socket=yes"
++	eval "LIB_socket="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_socket=no"
++	eval "LIB_socket="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_socket=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_socket"; then
++	LIBS="$LIB_socket $LIBS"
++fi
++
++
++
++
++
++echo "$as_me:$LINENO: checking for gethostbyname" >&5
++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
++if test "${ac_cv_funclib_gethostbyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_gethostbyname\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" nsl; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++gethostbyname()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_gethostbyname"
++
++if false; then
++	
++for ac_func in gethostbyname
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# gethostbyname
++eval "ac_tr_func=HAVE_`echo gethostbyname | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_gethostbyname=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_gethostbyname=yes"
++	eval "LIB_gethostbyname="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_gethostbyname=no"
++	eval "LIB_gethostbyname="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_gethostbyname=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_gethostbyname"; then
++	LIBS="$LIB_gethostbyname $LIBS"
++fi
++
++
++
++
++
++echo "$as_me:$LINENO: checking for syslog" >&5
++echo $ECHO_N "checking for syslog... $ECHO_C" >&6
++if test "${ac_cv_funclib_syslog+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_syslog\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" syslog; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++syslog()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_syslog"
++
++if false; then
++	
++for ac_func in syslog
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# syslog
++eval "ac_tr_func=HAVE_`echo syslog | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_syslog=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_syslog=yes"
++	eval "LIB_syslog="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_syslog=no"
++	eval "LIB_syslog="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_syslog=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_syslog"; then
++	LIBS="$LIB_syslog $LIBS"
++fi
++
++
++
++
++# Check whether --with-ipv6 or --without-ipv6 was given.
++if test "${with_ipv6+set}" = set; then
++  withval="$with_ipv6"
++  
++if test "$withval" = "no"; then
++	ac_cv_lib_ipv6=no
++fi
++fi; 
++save_CFLAGS="${CFLAGS}"
++echo "$as_me:$LINENO: checking for IPv6 stack type" >&5
++echo $ECHO_N "checking for IPv6 stack type... $ECHO_C" >&6
++if test "${v6type+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  v6type=unknown
++v6lib=none
++
++for i in v6d toshiba kame inria zeta linux; do
++	case $i in
++	v6d)
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include </usr/local/v6/include/sys/types.h>
++#ifdef __V6D__
++yes
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  v6type=$i; v6lib=v6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-I/usr/local/v6/include $CFLAGS"
++fi
++rm -f conftest*
++
++		;;
++	toshiba)
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/param.h>
++#ifdef _TOSHIBA_INET6
++yes
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  v6type=$i; v6lib=inet6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-DINET6 $CFLAGS"
++fi
++rm -f conftest*
++
++		;;
++	kame)
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <netinet/in.h>
++#ifdef __KAME__
++yes
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  v6type=$i; v6lib=inet6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-DINET6 $CFLAGS"
++fi
++rm -f conftest*
++
++		;;
++	inria)
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <netinet/in.h>
++#ifdef IPV6_INRIA_VERSION
++yes
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  v6type=$i; CFLAGS="-DINET6 $CFLAGS"
++fi
++rm -f conftest*
++
++		;;
++	zeta)
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/param.h>
++#ifdef _ZETA_MINAMI_INET6
++yes
++#endif
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "yes" >/dev/null 2>&1; then
++  v6type=$i; v6lib=inet6;
++			v6libdir=/usr/local/v6/lib;
++			CFLAGS="-DINET6 $CFLAGS"
++fi
++rm -f conftest*
++
++		;;
++	linux)
++		if test -d /usr/inet6; then
++			v6type=$i
++			v6lib=inet6
++			v6libdir=/usr/inet6
++			CFLAGS="-DINET6 $CFLAGS"
++		fi
++		;;
++	esac
++	if test "$v6type" != "unknown"; then
++		break
++	fi
++done
++
++if test "$v6lib" != "none"; then
++	for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
++		if test -d $dir -a -f $dir/lib$v6lib.a; then
++			LIBS="-L$dir -l$v6lib $LIBS"
++			break
++		fi
++	done
++fi
++
++fi
++echo "$as_me:$LINENO: result: $v6type" >&5
++echo "${ECHO_T}$v6type" >&6
++
++echo "$as_me:$LINENO: checking for IPv6" >&5
++echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
++if test "${ac_cv_lib_ipv6+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_NETINET_IN6_H
++#include <netinet/in6.h>
++#endif
++
++int
++main ()
++{
++
++ struct sockaddr_in6 sin6;
++ int s;
++
++ s = socket(AF_INET6, SOCK_DGRAM, 0);
++
++ sin6.sin6_family = AF_INET6;
++ sin6.sin6_port = htons(17);
++ sin6.sin6_addr = in6addr_any;
++ bind(s, (struct sockaddr *)&sin6, sizeof(sin6));
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ipv6=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ipv6=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ipv6" >&5
++echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
++if test "$ac_cv_lib_ipv6" = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_IPV6 1
++_ACEOF
++
++else
++  CFLAGS="${save_CFLAGS}"
++fi
++
++if test "$ac_cv_lib_ipv6" = yes; then
++	echo "$as_me:$LINENO: checking for in6addr_loopback" >&5
++echo $ECHO_N "checking for in6addr_loopback... $ECHO_C" >&6
++if test "${ac_cv_var_in6addr_loopback+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_NETINET_IN6_H
++#include <netinet/in6.h>
++#endif
++int
++main ()
++{
++
++struct sockaddr_in6 sin6;
++sin6.sin6_addr = in6addr_loopback;
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_in6addr_loopback=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_in6addr_loopback=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_var_in6addr_loopback" >&5
++echo "${ECHO_T}$ac_cv_var_in6addr_loopback" >&6
++	if test "$ac_cv_var_in6addr_loopback" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_IN6ADDR_LOOPBACK 1
++_ACEOF
++
++	fi
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for gethostbyname2" >&5
++echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
++if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_gethostbyname2\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" inet6 ip6; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++gethostbyname2()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_gethostbyname2"
++
++if false; then
++	
++for ac_func in gethostbyname2
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# gethostbyname2
++eval "ac_tr_func=HAVE_`echo gethostbyname2 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_gethostbyname2=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_gethostbyname2=yes"
++	eval "LIB_gethostbyname2="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_gethostbyname2=no"
++	eval "LIB_gethostbyname2="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_gethostbyname2=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_gethostbyname2"; then
++	LIBS="$LIB_gethostbyname2 $LIBS"
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for res_search" >&5
++echo $ECHO_N "checking for res_search... $ECHO_C" >&6
++if test "${ac_cv_funclib_res_search+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_res_search\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" resolv; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++
++int
++main ()
++{
++res_search(0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_res_search"
++
++if false; then
++	
++for ac_func in res_search
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# res_search
++eval "ac_tr_func=HAVE_`echo res_search | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_res_search=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_res_search=yes"
++	eval "LIB_res_search="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_res_search=no"
++	eval "LIB_res_search="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_res_search=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_res_search"; then
++	LIBS="$LIB_res_search $LIBS"
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for res_nsearch" >&5
++echo $ECHO_N "checking for res_nsearch... $ECHO_C" >&6
++if test "${ac_cv_funclib_res_nsearch+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_res_nsearch\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" resolv; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++
++int
++main ()
++{
++res_nsearch(0,0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_nsearch=$ac_lib; else ac_cv_funclib_res_nsearch=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_res_nsearch=\${ac_cv_funclib_res_nsearch-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_res_nsearch"
++
++if false; then
++	
++for ac_func in res_nsearch
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# res_nsearch
++eval "ac_tr_func=HAVE_`echo res_nsearch | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_res_nsearch=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_res_nsearch=yes"
++	eval "LIB_res_nsearch="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_res_nsearch=no"
++	eval "LIB_res_nsearch="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_res_nsearch=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_res_nsearch"; then
++	LIBS="$LIB_res_nsearch $LIBS"
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for dn_expand" >&5
++echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
++if test "${ac_cv_funclib_dn_expand+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_dn_expand\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" resolv; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++
++int
++main ()
++{
++dn_expand(0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_dn_expand"
++
++if false; then
++	
++for ac_func in dn_expand
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# dn_expand
++eval "ac_tr_func=HAVE_`echo dn_expand | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_dn_expand=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_dn_expand=yes"
++	eval "LIB_dn_expand="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_dn_expand=no"
++	eval "LIB_dn_expand="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_dn_expand=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_dn_expand"; then
++	LIBS="$LIB_dn_expand $LIBS"
++fi
++
++
++
++echo "$as_me:$LINENO: checking for _res" >&5
++echo $ECHO_N "checking for _res... $ECHO_C" >&6
++if test "${ac_cv_var__res+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++	void * foo() { return &_res; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var__res=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var__res=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var__res" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int _res;
++int foo() { return _res; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var__res=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var__res=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var__res`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE__RES 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if _res is properly declared" >&5
++echo $ECHO_N "checking if _res is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var__res_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_NAMESER_H
++#include <arpa/nameser.h>
++#endif
++#ifdef HAVE_RESOLV_H
++#include <resolv.h>
++#endif
++extern struct { int foo; } _res;
++int
++main ()
++{
++_res.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var__res_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var__res_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var__res_declaration" >&5
++echo "${ECHO_T}$ac_cv_var__res_declaration" >&6
++if eval "test \"\$ac_cv_var__res_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE__RES_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for working snprintf" >&5
++echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
++if test "${ac_cv_func_snprintf_working+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_func_snprintf_working=yes
++if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#include <string.h>
++int main()
++{
++	char foo[3];
++	snprintf(foo, 2, "12");
++	return strcmp(foo, "1");
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_snprintf_working=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_snprintf_working" >&5
++echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
++
++if test "$ac_cv_func_snprintf_working" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SNPRINTF 1
++_ACEOF
++
++fi
++if test "$ac_cv_func_snprintf_working" = yes; then
++
++if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
++echo "$as_me:$LINENO: checking if snprintf needs a prototype" >&5
++echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_snprintf_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int snprintf (struct foo*);
++snprintf(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_snprintf_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_snprintf_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_snprintf_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
++if test "$ac_cv_func_snprintf_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_SNPRINTF_PROTO 1
++_ACEOF
++
++fi
++fi
++
++fi
++
++
++echo "$as_me:$LINENO: checking for working vsnprintf" >&5
++echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
++if test "${ac_cv_func_vsnprintf_working+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_func_vsnprintf_working=yes
++if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#include <string.h>
++#include <stdarg.h>
++
++int foo(int num, ...)
++{
++	char bar[3];
++	va_list arg;
++	va_start(arg, num);
++	vsnprintf(bar, 2, "%s", arg);
++	va_end(arg);
++	return strcmp(bar, "1");
++}
++
++
++int main()
++{
++	return foo(0, "12");
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_vsnprintf_working=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf_working" >&5
++echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
++
++if test "$ac_cv_func_vsnprintf_working" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_VSNPRINTF 1
++_ACEOF
++
++fi
++if test "$ac_cv_func_vsnprintf_working" = yes; then
++
++if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
++echo "$as_me:$LINENO: checking if vsnprintf needs a prototype" >&5
++echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int vsnprintf (struct foo*);
++vsnprintf(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_vsnprintf_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_vsnprintf_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
++if test "$ac_cv_func_vsnprintf_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_VSNPRINTF_PROTO 1
++_ACEOF
++
++fi
++fi
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking for working glob" >&5
++echo $ECHO_N "checking for working glob... $ECHO_C" >&6
++if test "${ac_cv_func_glob_working+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_func_glob_working=yes
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <stdio.h>
++#include <glob.h>
++int
++main ()
++{
++
++glob(NULL, GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE|
++#ifdef GLOB_MAXPATH
++GLOB_MAXPATH
++#else
++GLOB_LIMIT
++#endif
++,
++NULL, NULL);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_glob_working=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_glob_working" >&5
++echo "${ECHO_T}$ac_cv_func_glob_working" >&6
++
++if test "$ac_cv_func_glob_working" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GLOB 1
++_ACEOF
++
++fi
++if test "$ac_cv_func_glob_working" = yes; then
++
++if test "$ac_cv_func_glob+set" != set -o "$ac_cv_func_glob" = yes; then
++echo "$as_me:$LINENO: checking if glob needs a prototype" >&5
++echo $ECHO_N "checking if glob needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_glob_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++#include <glob.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int glob (struct foo*);
++glob(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_glob_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_glob_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_glob_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_glob_noproto" >&6
++if test "$ac_cv_func_glob_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_GLOB_PROTO 1
++_ACEOF
++
++fi
++fi
++
++fi
++
++if test "$ac_cv_func_glob_working" != yes; then
++	case $LIB@&t@OBJS in
++    "glob.$ac_objext"   | \
++  *" glob.$ac_objext"   | \
++    "glob.$ac_objext "* | \
++  *" glob.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS glob.$ac_objext" ;;
++esac
++
++fi
++
++
++if test "$ac_cv_func_glob_working" = yes; then
++  have_glob_h_TRUE=
++  have_glob_h_FALSE='#'
++else
++  have_glob_h_TRUE='#'
++  have_glob_h_FALSE=
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++for ac_func in 				\
++	asnprintf				\
++	asprintf				\
++	atexit					\
++	cgetent					\
++	getconfattr				\
++	getprogname				\
++	getrlimit				\
++	getspnam				\
++	initstate				\
++	issetugid				\
++	on_exit					\
++	random					\
++	setprogname				\
++	setstate				\
++	strsvis					\
++	strunvis				\
++	strvis					\
++	strvisx					\
++	svis					\
++	sysconf					\
++	sysctl					\
++	uname					\
++	unvis					\
++	vasnprintf				\
++	vasprintf				\
++	vis					\
++
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++if test "$ac_cv_func_cgetent" = no; then
++	case $LIB@&t@OBJS in
++    "getcap.$ac_objext"   | \
++  *" getcap.$ac_objext"   | \
++    "getcap.$ac_objext "* | \
++  *" getcap.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getcap.$ac_objext" ;;
++esac
++
++fi
++
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for getsockopt" >&5
++echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
++if test "${ac_cv_funclib_getsockopt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_getsockopt\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++int
++main ()
++{
++getsockopt(0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_getsockopt"
++
++if false; then
++	
++for ac_func in getsockopt
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# getsockopt
++eval "ac_tr_func=HAVE_`echo getsockopt | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_getsockopt=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_getsockopt=yes"
++	eval "LIB_getsockopt="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_getsockopt=no"
++	eval "LIB_getsockopt="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_getsockopt=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++echo "$as_me:$LINENO: checking for setsockopt" >&5
++echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
++if test "${ac_cv_funclib_setsockopt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_setsockopt\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++int
++main ()
++{
++setsockopt(0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_setsockopt"
++
++if false; then
++	
++for ac_func in setsockopt
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# setsockopt
++eval "ac_tr_func=HAVE_`echo setsockopt | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_setsockopt=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_setsockopt=yes"
++	eval "LIB_setsockopt="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_setsockopt=no"
++	eval "LIB_setsockopt="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_setsockopt=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for hstrerror" >&5
++echo $ECHO_N "checking for hstrerror... $ECHO_C" >&6
++if test "${ac_cv_funclib_hstrerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_hstrerror\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" resolv; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++int
++main ()
++{
++hstrerror(17)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_hstrerror=$ac_lib; else ac_cv_funclib_hstrerror=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_hstrerror=\${ac_cv_funclib_hstrerror-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_hstrerror"
++
++if false; then
++	
++for ac_func in hstrerror
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# hstrerror
++eval "ac_tr_func=HAVE_`echo hstrerror | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_hstrerror=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_hstrerror=yes"
++	eval "LIB_hstrerror="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_hstrerror=no"
++	eval "LIB_hstrerror="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_hstrerror=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_hstrerror"; then
++	LIBS="$LIB_hstrerror $LIBS"
++fi
++
++if eval "test \"$ac_cv_func_hstrerror\" != yes"; then 
++	case $LIB@&t@OBJS in
++    "hstrerror.$ac_objext"   | \
++  *" hstrerror.$ac_objext"   | \
++    "hstrerror.$ac_objext "* | \
++  *" hstrerror.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS hstrerror.$ac_objext" ;;
++esac
++
++fi
++
++
++if test "$ac_cv_func_hstrerror+set" != set -o "$ac_cv_func_hstrerror" = yes; then
++echo "$as_me:$LINENO: checking if hstrerror needs a prototype" >&5
++echo $ECHO_N "checking if hstrerror needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_hstrerror_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int hstrerror (struct foo*);
++hstrerror(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_hstrerror_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_hstrerror_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_hstrerror_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_hstrerror_noproto" >&6
++if test "$ac_cv_func_hstrerror_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_HSTRERROR_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++
++if test "$ac_cv_func_asprintf+set" != set -o "$ac_cv_func_asprintf" = yes; then
++echo "$as_me:$LINENO: checking if asprintf needs a prototype" >&5
++echo $ECHO_N "checking if asprintf needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_asprintf_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++	#include <stdio.h>
++	#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int asprintf (struct foo*);
++asprintf(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_asprintf_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_asprintf_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_asprintf_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_asprintf_noproto" >&6
++if test "$ac_cv_func_asprintf_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_ASPRINTF_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_vasprintf+set" != set -o "$ac_cv_func_vasprintf" = yes; then
++echo "$as_me:$LINENO: checking if vasprintf needs a prototype" >&5
++echo $ECHO_N "checking if vasprintf needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_vasprintf_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++	#include <stdio.h>
++	#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int vasprintf (struct foo*);
++vasprintf(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_vasprintf_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_vasprintf_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vasprintf_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_vasprintf_noproto" >&6
++if test "$ac_cv_func_vasprintf_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_VASPRINTF_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_asnprintf+set" != set -o "$ac_cv_func_asnprintf" = yes; then
++echo "$as_me:$LINENO: checking if asnprintf needs a prototype" >&5
++echo $ECHO_N "checking if asnprintf needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_asnprintf_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++	#include <stdio.h>
++	#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int asnprintf (struct foo*);
++asnprintf(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_asnprintf_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_asnprintf_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_asnprintf_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_asnprintf_noproto" >&6
++if test "$ac_cv_func_asnprintf_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_ASNPRINTF_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_vasnprintf+set" != set -o "$ac_cv_func_vasnprintf" = yes; then
++echo "$as_me:$LINENO: checking if vasnprintf needs a prototype" >&5
++echo $ECHO_N "checking if vasnprintf needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_vasnprintf_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++	#include <stdio.h>
++	#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int vasnprintf (struct foo*);
++vasnprintf(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_vasnprintf_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_vasnprintf_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vasnprintf_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_vasnprintf_noproto" >&6
++if test "$ac_cv_func_vasnprintf_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_VASNPRINTF_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++
++
++
++echo "$as_me:$LINENO: checking for bswap16" >&5
++echo $ECHO_N "checking for bswap16... $ECHO_C" >&6
++if test "${ac_cv_funclib_bswap16+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_bswap16\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_BSWAP_H
++#include <sys/bswap.h>
++#endif
++int
++main ()
++{
++bswap16(0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_bswap16=$ac_lib; else ac_cv_funclib_bswap16=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_bswap16=\${ac_cv_funclib_bswap16-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_bswap16"
++
++if false; then
++	
++for ac_func in bswap16
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# bswap16
++eval "ac_tr_func=HAVE_`echo bswap16 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_bswap16=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_bswap16=yes"
++	eval "LIB_bswap16="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_bswap16=no"
++	eval "LIB_bswap16="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_bswap16=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for bswap32" >&5
++echo $ECHO_N "checking for bswap32... $ECHO_C" >&6
++if test "${ac_cv_funclib_bswap32+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_bswap32\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_BSWAP_H
++#include <sys/bswap.h>
++#endif
++int
++main ()
++{
++bswap32(0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_bswap32=$ac_lib; else ac_cv_funclib_bswap32=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_bswap32=\${ac_cv_funclib_bswap32-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_bswap32"
++
++if false; then
++	
++for ac_func in bswap32
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# bswap32
++eval "ac_tr_func=HAVE_`echo bswap32 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_bswap32=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_bswap32=yes"
++	eval "LIB_bswap32="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_bswap32=no"
++	eval "LIB_bswap32="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_bswap32=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for pidfile" >&5
++echo $ECHO_N "checking for pidfile... $ECHO_C" >&6
++if test "${ac_cv_funclib_pidfile+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_pidfile\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" util; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_UTIL_H
++#include <util.h>
++#endif
++int
++main ()
++{
++pidfile(0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_pidfile=$ac_lib; else ac_cv_funclib_pidfile=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_pidfile=\${ac_cv_funclib_pidfile-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_pidfile"
++
++if false; then
++	
++for ac_func in pidfile
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# pidfile
++eval "ac_tr_func=HAVE_`echo pidfile | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_pidfile=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_pidfile=yes"
++	eval "LIB_pidfile="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_pidfile=no"
++	eval "LIB_pidfile="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_pidfile=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for getaddrinfo" >&5
++echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
++if test "${ac_cv_funclib_getaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_getaddrinfo\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++int
++main ()
++{
++getaddrinfo(0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getaddrinfo=$ac_lib; else ac_cv_funclib_getaddrinfo=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_getaddrinfo=\${ac_cv_funclib_getaddrinfo-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_getaddrinfo"
++
++if false; then
++	
++for ac_func in getaddrinfo
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# getaddrinfo
++eval "ac_tr_func=HAVE_`echo getaddrinfo | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_getaddrinfo=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_getaddrinfo=yes"
++	eval "LIB_getaddrinfo="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_getaddrinfo=no"
++	eval "LIB_getaddrinfo="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_getaddrinfo=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_getaddrinfo"; then
++	LIBS="$LIB_getaddrinfo $LIBS"
++fi
++
++if eval "test \"$ac_cv_func_getaddrinfo\" != yes"; then 
++	case $LIB@&t@OBJS in
++    "getaddrinfo.$ac_objext"   | \
++  *" getaddrinfo.$ac_objext"   | \
++    "getaddrinfo.$ac_objext "* | \
++  *" getaddrinfo.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getaddrinfo.$ac_objext" ;;
++esac
++
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for getnameinfo" >&5
++echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6
++if test "${ac_cv_funclib_getnameinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_getnameinfo\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++int
++main ()
++{
++getnameinfo(0,0,0,0,0,0,0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getnameinfo=$ac_lib; else ac_cv_funclib_getnameinfo=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_getnameinfo=\${ac_cv_funclib_getnameinfo-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_getnameinfo"
++
++if false; then
++	
++for ac_func in getnameinfo
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# getnameinfo
++eval "ac_tr_func=HAVE_`echo getnameinfo | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_getnameinfo=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_getnameinfo=yes"
++	eval "LIB_getnameinfo="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_getnameinfo=no"
++	eval "LIB_getnameinfo="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_getnameinfo=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_getnameinfo"; then
++	LIBS="$LIB_getnameinfo $LIBS"
++fi
++
++if eval "test \"$ac_cv_func_getnameinfo\" != yes"; then 
++	case $LIB@&t@OBJS in
++    "getnameinfo.$ac_objext"   | \
++  *" getnameinfo.$ac_objext"   | \
++    "getnameinfo.$ac_objext "* | \
++  *" getnameinfo.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getnameinfo.$ac_objext" ;;
++esac
++
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for freeaddrinfo" >&5
++echo $ECHO_N "checking for freeaddrinfo... $ECHO_C" >&6
++if test "${ac_cv_funclib_freeaddrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_freeaddrinfo\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++int
++main ()
++{
++freeaddrinfo(0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_freeaddrinfo=$ac_lib; else ac_cv_funclib_freeaddrinfo=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_freeaddrinfo=\${ac_cv_funclib_freeaddrinfo-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_freeaddrinfo"
++
++if false; then
++	
++for ac_func in freeaddrinfo
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# freeaddrinfo
++eval "ac_tr_func=HAVE_`echo freeaddrinfo | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_freeaddrinfo=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_freeaddrinfo=yes"
++	eval "LIB_freeaddrinfo="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_freeaddrinfo=no"
++	eval "LIB_freeaddrinfo="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_freeaddrinfo=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_freeaddrinfo"; then
++	LIBS="$LIB_freeaddrinfo $LIBS"
++fi
++
++if eval "test \"$ac_cv_func_freeaddrinfo\" != yes"; then 
++	case $LIB@&t@OBJS in
++    "freeaddrinfo.$ac_objext"   | \
++  *" freeaddrinfo.$ac_objext"   | \
++    "freeaddrinfo.$ac_objext "* | \
++  *" freeaddrinfo.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS freeaddrinfo.$ac_objext" ;;
++esac
++
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for gai_strerror" >&5
++echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6
++if test "${ac_cv_funclib_gai_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_gai_strerror\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++int
++main ()
++{
++gai_strerror(0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_gai_strerror=$ac_lib; else ac_cv_funclib_gai_strerror=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_gai_strerror=\${ac_cv_funclib_gai_strerror-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_gai_strerror"
++
++if false; then
++	
++for ac_func in gai_strerror
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# gai_strerror
++eval "ac_tr_func=HAVE_`echo gai_strerror | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_gai_strerror=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_gai_strerror=yes"
++	eval "LIB_gai_strerror="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_gai_strerror=no"
++	eval "LIB_gai_strerror="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_gai_strerror=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test -n "$LIB_gai_strerror"; then
++	LIBS="$LIB_gai_strerror $LIBS"
++fi
++
++if eval "test \"$ac_cv_func_gai_strerror\" != yes"; then 
++	case $LIB@&t@OBJS in
++    "gai_strerror.$ac_objext"   | \
++  *" gai_strerror.$ac_objext"   | \
++    "gai_strerror.$ac_objext "* | \
++  *" gai_strerror.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS gai_strerror.$ac_objext" ;;
++esac
++
++fi
++
++
++echo "$as_me:$LINENO: checking for chown" >&5
++echo $ECHO_N "checking for chown... $ECHO_C" >&6
++if test "${ac_cv_func_chown+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define chown to an innocuous variant, in case <limits.h> declares chown.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define chown innocuous_chown
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char chown (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef chown
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char chown ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_chown) || defined (__stub___chown)
++choke me
++#else
++char (*f) () = chown;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != chown;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_chown=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_chown=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_chown" >&5
++echo "${ECHO_T}$ac_cv_func_chown" >&6
++if test $ac_cv_func_chown = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_CHOWN 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "chown.$ac_objext"   | \
++  *" chown.$ac_objext"   | \
++    "chown.$ac_objext "* | \
++  *" chown.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS chown.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for copyhostent" >&5
++echo $ECHO_N "checking for copyhostent... $ECHO_C" >&6
++if test "${ac_cv_func_copyhostent+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define copyhostent to an innocuous variant, in case <limits.h> declares copyhostent.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define copyhostent innocuous_copyhostent
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char copyhostent (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef copyhostent
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char copyhostent ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_copyhostent) || defined (__stub___copyhostent)
++choke me
++#else
++char (*f) () = copyhostent;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != copyhostent;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_copyhostent=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_copyhostent=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_copyhostent" >&5
++echo "${ECHO_T}$ac_cv_func_copyhostent" >&6
++if test $ac_cv_func_copyhostent = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_COPYHOSTENT 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "copyhostent.$ac_objext"   | \
++  *" copyhostent.$ac_objext"   | \
++    "copyhostent.$ac_objext "* | \
++  *" copyhostent.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS copyhostent.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for daemon" >&5
++echo $ECHO_N "checking for daemon... $ECHO_C" >&6
++if test "${ac_cv_func_daemon+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define daemon to an innocuous variant, in case <limits.h> declares daemon.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define daemon innocuous_daemon
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char daemon (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef daemon
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char daemon ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_daemon) || defined (__stub___daemon)
++choke me
++#else
++char (*f) () = daemon;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != daemon;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_daemon=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_daemon=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_daemon" >&5
++echo "${ECHO_T}$ac_cv_func_daemon" >&6
++if test $ac_cv_func_daemon = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_DAEMON 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "daemon.$ac_objext"   | \
++  *" daemon.$ac_objext"   | \
++    "daemon.$ac_objext "* | \
++  *" daemon.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS daemon.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for ecalloc" >&5
++echo $ECHO_N "checking for ecalloc... $ECHO_C" >&6
++if test "${ac_cv_func_ecalloc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define ecalloc to an innocuous variant, in case <limits.h> declares ecalloc.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define ecalloc innocuous_ecalloc
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ecalloc (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef ecalloc
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char ecalloc ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_ecalloc) || defined (__stub___ecalloc)
++choke me
++#else
++char (*f) () = ecalloc;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != ecalloc;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_ecalloc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_ecalloc=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_ecalloc" >&5
++echo "${ECHO_T}$ac_cv_func_ecalloc" >&6
++if test $ac_cv_func_ecalloc = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_ECALLOC 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "ecalloc.$ac_objext"   | \
++  *" ecalloc.$ac_objext"   | \
++    "ecalloc.$ac_objext "* | \
++  *" ecalloc.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS ecalloc.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for emalloc" >&5
++echo $ECHO_N "checking for emalloc... $ECHO_C" >&6
++if test "${ac_cv_func_emalloc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define emalloc to an innocuous variant, in case <limits.h> declares emalloc.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define emalloc innocuous_emalloc
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char emalloc (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef emalloc
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char emalloc ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_emalloc) || defined (__stub___emalloc)
++choke me
++#else
++char (*f) () = emalloc;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != emalloc;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_emalloc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_emalloc=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_emalloc" >&5
++echo "${ECHO_T}$ac_cv_func_emalloc" >&6
++if test $ac_cv_func_emalloc = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_EMALLOC 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "emalloc.$ac_objext"   | \
++  *" emalloc.$ac_objext"   | \
++    "emalloc.$ac_objext "* | \
++  *" emalloc.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS emalloc.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for erealloc" >&5
++echo $ECHO_N "checking for erealloc... $ECHO_C" >&6
++if test "${ac_cv_func_erealloc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define erealloc to an innocuous variant, in case <limits.h> declares erealloc.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define erealloc innocuous_erealloc
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char erealloc (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef erealloc
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char erealloc ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_erealloc) || defined (__stub___erealloc)
++choke me
++#else
++char (*f) () = erealloc;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != erealloc;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_erealloc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_erealloc=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_erealloc" >&5
++echo "${ECHO_T}$ac_cv_func_erealloc" >&6
++if test $ac_cv_func_erealloc = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_EREALLOC 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "erealloc.$ac_objext"   | \
++  *" erealloc.$ac_objext"   | \
++    "erealloc.$ac_objext "* | \
++  *" erealloc.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS erealloc.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for estrdup" >&5
++echo $ECHO_N "checking for estrdup... $ECHO_C" >&6
++if test "${ac_cv_func_estrdup+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define estrdup to an innocuous variant, in case <limits.h> declares estrdup.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define estrdup innocuous_estrdup
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char estrdup (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef estrdup
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char estrdup ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_estrdup) || defined (__stub___estrdup)
++choke me
++#else
++char (*f) () = estrdup;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != estrdup;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_estrdup=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_estrdup=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_estrdup" >&5
++echo "${ECHO_T}$ac_cv_func_estrdup" >&6
++if test $ac_cv_func_estrdup = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_ESTRDUP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "estrdup.$ac_objext"   | \
++  *" estrdup.$ac_objext"   | \
++    "estrdup.$ac_objext "* | \
++  *" estrdup.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS estrdup.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for err" >&5
++echo $ECHO_N "checking for err... $ECHO_C" >&6
++if test "${ac_cv_func_err+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define err to an innocuous variant, in case <limits.h> declares err.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define err innocuous_err
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char err (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef err
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char err ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_err) || defined (__stub___err)
++choke me
++#else
++char (*f) () = err;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != err;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_err=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_err=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_err" >&5
++echo "${ECHO_T}$ac_cv_func_err" >&6
++if test $ac_cv_func_err = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_ERR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "err.$ac_objext"   | \
++  *" err.$ac_objext"   | \
++    "err.$ac_objext "* | \
++  *" err.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS err.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for errx" >&5
++echo $ECHO_N "checking for errx... $ECHO_C" >&6
++if test "${ac_cv_func_errx+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define errx to an innocuous variant, in case <limits.h> declares errx.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define errx innocuous_errx
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char errx (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef errx
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char errx ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_errx) || defined (__stub___errx)
++choke me
++#else
++char (*f) () = errx;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != errx;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_errx=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_errx=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_errx" >&5
++echo "${ECHO_T}$ac_cv_func_errx" >&6
++if test $ac_cv_func_errx = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_ERRX 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "errx.$ac_objext"   | \
++  *" errx.$ac_objext"   | \
++    "errx.$ac_objext "* | \
++  *" errx.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS errx.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for fchown" >&5
++echo $ECHO_N "checking for fchown... $ECHO_C" >&6
++if test "${ac_cv_func_fchown+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define fchown to an innocuous variant, in case <limits.h> declares fchown.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define fchown innocuous_fchown
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char fchown (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef fchown
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fchown ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_fchown) || defined (__stub___fchown)
++choke me
++#else
++char (*f) () = fchown;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != fchown;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_fchown=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_fchown=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_fchown" >&5
++echo "${ECHO_T}$ac_cv_func_fchown" >&6
++if test $ac_cv_func_fchown = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_FCHOWN 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "fchown.$ac_objext"   | \
++  *" fchown.$ac_objext"   | \
++    "fchown.$ac_objext "* | \
++  *" fchown.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS fchown.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for flock" >&5
++echo $ECHO_N "checking for flock... $ECHO_C" >&6
++if test "${ac_cv_func_flock+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define flock to an innocuous variant, in case <limits.h> declares flock.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define flock innocuous_flock
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char flock (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef flock
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char flock ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_flock) || defined (__stub___flock)
++choke me
++#else
++char (*f) () = flock;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != flock;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_flock=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_flock=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
++echo "${ECHO_T}$ac_cv_func_flock" >&6
++if test $ac_cv_func_flock = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_FLOCK 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "flock.$ac_objext"   | \
++  *" flock.$ac_objext"   | \
++    "flock.$ac_objext "* | \
++  *" flock.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS flock.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for fnmatch" >&5
++echo $ECHO_N "checking for fnmatch... $ECHO_C" >&6
++if test "${ac_cv_func_fnmatch+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define fnmatch to an innocuous variant, in case <limits.h> declares fnmatch.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define fnmatch innocuous_fnmatch
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char fnmatch (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef fnmatch
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char fnmatch ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_fnmatch) || defined (__stub___fnmatch)
++choke me
++#else
++char (*f) () = fnmatch;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != fnmatch;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_fnmatch=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_fnmatch=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_fnmatch" >&5
++echo "${ECHO_T}$ac_cv_func_fnmatch" >&6
++if test $ac_cv_func_fnmatch = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_FNMATCH 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "fnmatch.$ac_objext"   | \
++  *" fnmatch.$ac_objext"   | \
++    "fnmatch.$ac_objext "* | \
++  *" fnmatch.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS fnmatch.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for freehostent" >&5
++echo $ECHO_N "checking for freehostent... $ECHO_C" >&6
++if test "${ac_cv_func_freehostent+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define freehostent to an innocuous variant, in case <limits.h> declares freehostent.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define freehostent innocuous_freehostent
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char freehostent (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef freehostent
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char freehostent ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_freehostent) || defined (__stub___freehostent)
++choke me
++#else
++char (*f) () = freehostent;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != freehostent;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_freehostent=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_freehostent=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_freehostent" >&5
++echo "${ECHO_T}$ac_cv_func_freehostent" >&6
++if test $ac_cv_func_freehostent = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_FREEHOSTENT 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "freehostent.$ac_objext"   | \
++  *" freehostent.$ac_objext"   | \
++    "freehostent.$ac_objext "* | \
++  *" freehostent.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS freehostent.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getcwd" >&5
++echo $ECHO_N "checking for getcwd... $ECHO_C" >&6
++if test "${ac_cv_func_getcwd+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getcwd to an innocuous variant, in case <limits.h> declares getcwd.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getcwd innocuous_getcwd
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getcwd (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getcwd
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getcwd ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getcwd) || defined (__stub___getcwd)
++choke me
++#else
++char (*f) () = getcwd;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getcwd;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getcwd=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getcwd=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getcwd" >&5
++echo "${ECHO_T}$ac_cv_func_getcwd" >&6
++if test $ac_cv_func_getcwd = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETCWD 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getcwd.$ac_objext"   | \
++  *" getcwd.$ac_objext"   | \
++    "getcwd.$ac_objext "* | \
++  *" getcwd.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getcwd.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getdtablesize" >&5
++echo $ECHO_N "checking for getdtablesize... $ECHO_C" >&6
++if test "${ac_cv_func_getdtablesize+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getdtablesize to an innocuous variant, in case <limits.h> declares getdtablesize.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getdtablesize innocuous_getdtablesize
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getdtablesize (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getdtablesize
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getdtablesize ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getdtablesize) || defined (__stub___getdtablesize)
++choke me
++#else
++char (*f) () = getdtablesize;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getdtablesize;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getdtablesize=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getdtablesize=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getdtablesize" >&5
++echo "${ECHO_T}$ac_cv_func_getdtablesize" >&6
++if test $ac_cv_func_getdtablesize = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETDTABLESIZE 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getdtablesize.$ac_objext"   | \
++  *" getdtablesize.$ac_objext"   | \
++    "getdtablesize.$ac_objext "* | \
++  *" getdtablesize.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getdtablesize.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getegid" >&5
++echo $ECHO_N "checking for getegid... $ECHO_C" >&6
++if test "${ac_cv_func_getegid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getegid to an innocuous variant, in case <limits.h> declares getegid.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getegid innocuous_getegid
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getegid (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getegid
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getegid ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getegid) || defined (__stub___getegid)
++choke me
++#else
++char (*f) () = getegid;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getegid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getegid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getegid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getegid" >&5
++echo "${ECHO_T}$ac_cv_func_getegid" >&6
++if test $ac_cv_func_getegid = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETEGID 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getegid.$ac_objext"   | \
++  *" getegid.$ac_objext"   | \
++    "getegid.$ac_objext "* | \
++  *" getegid.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getegid.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for geteuid" >&5
++echo $ECHO_N "checking for geteuid... $ECHO_C" >&6
++if test "${ac_cv_func_geteuid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define geteuid to an innocuous variant, in case <limits.h> declares geteuid.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define geteuid innocuous_geteuid
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char geteuid (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef geteuid
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char geteuid ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_geteuid) || defined (__stub___geteuid)
++choke me
++#else
++char (*f) () = geteuid;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != geteuid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_geteuid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_geteuid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_geteuid" >&5
++echo "${ECHO_T}$ac_cv_func_geteuid" >&6
++if test $ac_cv_func_geteuid = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETEUID 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "geteuid.$ac_objext"   | \
++  *" geteuid.$ac_objext"   | \
++    "geteuid.$ac_objext "* | \
++  *" geteuid.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS geteuid.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getgid" >&5
++echo $ECHO_N "checking for getgid... $ECHO_C" >&6
++if test "${ac_cv_func_getgid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getgid to an innocuous variant, in case <limits.h> declares getgid.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getgid innocuous_getgid
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getgid (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getgid
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getgid ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getgid) || defined (__stub___getgid)
++choke me
++#else
++char (*f) () = getgid;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getgid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getgid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getgid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getgid" >&5
++echo "${ECHO_T}$ac_cv_func_getgid" >&6
++if test $ac_cv_func_getgid = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETGID 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getgid.$ac_objext"   | \
++  *" getgid.$ac_objext"   | \
++    "getgid.$ac_objext "* | \
++  *" getgid.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getgid.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for gethostname" >&5
++echo $ECHO_N "checking for gethostname... $ECHO_C" >&6
++if test "${ac_cv_func_gethostname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gethostname to an innocuous variant, in case <limits.h> declares gethostname.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gethostname innocuous_gethostname
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gethostname (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gethostname
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gethostname ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_gethostname) || defined (__stub___gethostname)
++choke me
++#else
++char (*f) () = gethostname;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != gethostname;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gethostname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_gethostname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostname" >&5
++echo "${ECHO_T}$ac_cv_func_gethostname" >&6
++if test $ac_cv_func_gethostname = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETHOSTNAME 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "gethostname.$ac_objext"   | \
++  *" gethostname.$ac_objext"   | \
++    "gethostname.$ac_objext "* | \
++  *" gethostname.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS gethostname.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getifaddrs" >&5
++echo $ECHO_N "checking for getifaddrs... $ECHO_C" >&6
++if test "${ac_cv_func_getifaddrs+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getifaddrs to an innocuous variant, in case <limits.h> declares getifaddrs.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getifaddrs innocuous_getifaddrs
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getifaddrs (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getifaddrs
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getifaddrs ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getifaddrs) || defined (__stub___getifaddrs)
++choke me
++#else
++char (*f) () = getifaddrs;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getifaddrs;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getifaddrs=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getifaddrs=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getifaddrs" >&5
++echo "${ECHO_T}$ac_cv_func_getifaddrs" >&6
++if test $ac_cv_func_getifaddrs = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETIFADDRS 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getifaddrs.$ac_objext"   | \
++  *" getifaddrs.$ac_objext"   | \
++    "getifaddrs.$ac_objext "* | \
++  *" getifaddrs.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getifaddrs.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getipnodebyaddr" >&5
++echo $ECHO_N "checking for getipnodebyaddr... $ECHO_C" >&6
++if test "${ac_cv_func_getipnodebyaddr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getipnodebyaddr to an innocuous variant, in case <limits.h> declares getipnodebyaddr.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getipnodebyaddr innocuous_getipnodebyaddr
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getipnodebyaddr (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getipnodebyaddr
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getipnodebyaddr ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getipnodebyaddr) || defined (__stub___getipnodebyaddr)
++choke me
++#else
++char (*f) () = getipnodebyaddr;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getipnodebyaddr;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getipnodebyaddr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getipnodebyaddr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getipnodebyaddr" >&5
++echo "${ECHO_T}$ac_cv_func_getipnodebyaddr" >&6
++if test $ac_cv_func_getipnodebyaddr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETIPNODEBYADDR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getipnodebyaddr.$ac_objext"   | \
++  *" getipnodebyaddr.$ac_objext"   | \
++    "getipnodebyaddr.$ac_objext "* | \
++  *" getipnodebyaddr.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getipnodebyaddr.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getipnodebyname" >&5
++echo $ECHO_N "checking for getipnodebyname... $ECHO_C" >&6
++if test "${ac_cv_func_getipnodebyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getipnodebyname to an innocuous variant, in case <limits.h> declares getipnodebyname.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getipnodebyname innocuous_getipnodebyname
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getipnodebyname (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getipnodebyname
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getipnodebyname ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getipnodebyname) || defined (__stub___getipnodebyname)
++choke me
++#else
++char (*f) () = getipnodebyname;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getipnodebyname;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getipnodebyname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getipnodebyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getipnodebyname" >&5
++echo "${ECHO_T}$ac_cv_func_getipnodebyname" >&6
++if test $ac_cv_func_getipnodebyname = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETIPNODEBYNAME 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getipnodebyname.$ac_objext"   | \
++  *" getipnodebyname.$ac_objext"   | \
++    "getipnodebyname.$ac_objext "* | \
++  *" getipnodebyname.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getipnodebyname.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getopt" >&5
++echo $ECHO_N "checking for getopt... $ECHO_C" >&6
++if test "${ac_cv_func_getopt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getopt to an innocuous variant, in case <limits.h> declares getopt.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getopt innocuous_getopt
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getopt (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getopt
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getopt ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getopt) || defined (__stub___getopt)
++choke me
++#else
++char (*f) () = getopt;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getopt;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getopt=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getopt=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getopt" >&5
++echo "${ECHO_T}$ac_cv_func_getopt" >&6
++if test $ac_cv_func_getopt = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETOPT 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getopt.$ac_objext"   | \
++  *" getopt.$ac_objext"   | \
++    "getopt.$ac_objext "* | \
++  *" getopt.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getopt.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for gettimeofday" >&5
++echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
++if test "${ac_cv_func_gettimeofday+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gettimeofday to an innocuous variant, in case <limits.h> declares gettimeofday.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gettimeofday innocuous_gettimeofday
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gettimeofday (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gettimeofday
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gettimeofday ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday)
++choke me
++#else
++char (*f) () = gettimeofday;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != gettimeofday;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gettimeofday=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_gettimeofday=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gettimeofday" >&5
++echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
++if test $ac_cv_func_gettimeofday = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETTIMEOFDAY 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "gettimeofday.$ac_objext"   | \
++  *" gettimeofday.$ac_objext"   | \
++    "gettimeofday.$ac_objext "* | \
++  *" gettimeofday.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS gettimeofday.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getuid" >&5
++echo $ECHO_N "checking for getuid... $ECHO_C" >&6
++if test "${ac_cv_func_getuid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getuid to an innocuous variant, in case <limits.h> declares getuid.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getuid innocuous_getuid
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getuid (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getuid
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getuid ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getuid) || defined (__stub___getuid)
++choke me
++#else
++char (*f) () = getuid;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getuid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getuid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getuid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getuid" >&5
++echo "${ECHO_T}$ac_cv_func_getuid" >&6
++if test $ac_cv_func_getuid = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETUID 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getuid.$ac_objext"   | \
++  *" getuid.$ac_objext"   | \
++    "getuid.$ac_objext "* | \
++  *" getuid.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getuid.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for getusershell" >&5
++echo $ECHO_N "checking for getusershell... $ECHO_C" >&6
++if test "${ac_cv_func_getusershell+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getusershell to an innocuous variant, in case <limits.h> declares getusershell.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getusershell innocuous_getusershell
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getusershell (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getusershell
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getusershell ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getusershell) || defined (__stub___getusershell)
++choke me
++#else
++char (*f) () = getusershell;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getusershell;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getusershell=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getusershell=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getusershell" >&5
++echo "${ECHO_T}$ac_cv_func_getusershell" >&6
++if test $ac_cv_func_getusershell = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_GETUSERSHELL 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "getusershell.$ac_objext"   | \
++  *" getusershell.$ac_objext"   | \
++    "getusershell.$ac_objext "* | \
++  *" getusershell.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getusershell.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for initgroups" >&5
++echo $ECHO_N "checking for initgroups... $ECHO_C" >&6
++if test "${ac_cv_func_initgroups+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define initgroups to an innocuous variant, in case <limits.h> declares initgroups.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define initgroups innocuous_initgroups
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char initgroups (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef initgroups
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char initgroups ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_initgroups) || defined (__stub___initgroups)
++choke me
++#else
++char (*f) () = initgroups;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != initgroups;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_initgroups=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_initgroups=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_initgroups" >&5
++echo "${ECHO_T}$ac_cv_func_initgroups" >&6
++if test $ac_cv_func_initgroups = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INITGROUPS 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "initgroups.$ac_objext"   | \
++  *" initgroups.$ac_objext"   | \
++    "initgroups.$ac_objext "* | \
++  *" initgroups.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS initgroups.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for innetgr" >&5
++echo $ECHO_N "checking for innetgr... $ECHO_C" >&6
++if test "${ac_cv_func_innetgr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define innetgr to an innocuous variant, in case <limits.h> declares innetgr.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define innetgr innocuous_innetgr
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char innetgr (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef innetgr
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char innetgr ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_innetgr) || defined (__stub___innetgr)
++choke me
++#else
++char (*f) () = innetgr;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != innetgr;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_innetgr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_innetgr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_innetgr" >&5
++echo "${ECHO_T}$ac_cv_func_innetgr" >&6
++if test $ac_cv_func_innetgr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INNETGR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "innetgr.$ac_objext"   | \
++  *" innetgr.$ac_objext"   | \
++    "innetgr.$ac_objext "* | \
++  *" innetgr.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS innetgr.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for iruserok" >&5
++echo $ECHO_N "checking for iruserok... $ECHO_C" >&6
++if test "${ac_cv_func_iruserok+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define iruserok to an innocuous variant, in case <limits.h> declares iruserok.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define iruserok innocuous_iruserok
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char iruserok (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef iruserok
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char iruserok ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_iruserok) || defined (__stub___iruserok)
++choke me
++#else
++char (*f) () = iruserok;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != iruserok;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_iruserok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_iruserok=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_iruserok" >&5
++echo "${ECHO_T}$ac_cv_func_iruserok" >&6
++if test $ac_cv_func_iruserok = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_IRUSEROK 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "iruserok.$ac_objext"   | \
++  *" iruserok.$ac_objext"   | \
++    "iruserok.$ac_objext "* | \
++  *" iruserok.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS iruserok.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for localtime_r" >&5
++echo $ECHO_N "checking for localtime_r... $ECHO_C" >&6
++if test "${ac_cv_func_localtime_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define localtime_r to an innocuous variant, in case <limits.h> declares localtime_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define localtime_r innocuous_localtime_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char localtime_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef localtime_r
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char localtime_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_localtime_r) || defined (__stub___localtime_r)
++choke me
++#else
++char (*f) () = localtime_r;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != localtime_r;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_localtime_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_localtime_r=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_localtime_r" >&5
++echo "${ECHO_T}$ac_cv_func_localtime_r" >&6
++if test $ac_cv_func_localtime_r = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LOCALTIME_R 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "localtime_r.$ac_objext"   | \
++  *" localtime_r.$ac_objext"   | \
++    "localtime_r.$ac_objext "* | \
++  *" localtime_r.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS localtime_r.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for lstat" >&5
++echo $ECHO_N "checking for lstat... $ECHO_C" >&6
++if test "${ac_cv_func_lstat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define lstat to an innocuous variant, in case <limits.h> declares lstat.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define lstat innocuous_lstat
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char lstat (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef lstat
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char lstat ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_lstat) || defined (__stub___lstat)
++choke me
++#else
++char (*f) () = lstat;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != lstat;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_lstat=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_lstat=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_lstat" >&5
++echo "${ECHO_T}$ac_cv_func_lstat" >&6
++if test $ac_cv_func_lstat = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LSTAT 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "lstat.$ac_objext"   | \
++  *" lstat.$ac_objext"   | \
++    "lstat.$ac_objext "* | \
++  *" lstat.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS lstat.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for memmove" >&5
++echo $ECHO_N "checking for memmove... $ECHO_C" >&6
++if test "${ac_cv_func_memmove+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define memmove to an innocuous variant, in case <limits.h> declares memmove.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define memmove innocuous_memmove
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char memmove (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef memmove
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char memmove ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_memmove) || defined (__stub___memmove)
++choke me
++#else
++char (*f) () = memmove;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != memmove;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_memmove=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_memmove=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_memmove" >&5
++echo "${ECHO_T}$ac_cv_func_memmove" >&6
++if test $ac_cv_func_memmove = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_MEMMOVE 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "memmove.$ac_objext"   | \
++  *" memmove.$ac_objext"   | \
++    "memmove.$ac_objext "* | \
++  *" memmove.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS memmove.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for mkstemp" >&5
++echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
++if test "${ac_cv_func_mkstemp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define mkstemp to an innocuous variant, in case <limits.h> declares mkstemp.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define mkstemp innocuous_mkstemp
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char mkstemp (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef mkstemp
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char mkstemp ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_mkstemp) || defined (__stub___mkstemp)
++choke me
++#else
++char (*f) () = mkstemp;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != mkstemp;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mkstemp=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_mkstemp=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_mkstemp" >&5
++echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
++if test $ac_cv_func_mkstemp = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_MKSTEMP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "mkstemp.$ac_objext"   | \
++  *" mkstemp.$ac_objext"   | \
++    "mkstemp.$ac_objext "* | \
++  *" mkstemp.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS mkstemp.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for putenv" >&5
++echo $ECHO_N "checking for putenv... $ECHO_C" >&6
++if test "${ac_cv_func_putenv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define putenv to an innocuous variant, in case <limits.h> declares putenv.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define putenv innocuous_putenv
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char putenv (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef putenv
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char putenv ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_putenv) || defined (__stub___putenv)
++choke me
++#else
++char (*f) () = putenv;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != putenv;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_putenv=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_putenv=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_putenv" >&5
++echo "${ECHO_T}$ac_cv_func_putenv" >&6
++if test $ac_cv_func_putenv = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_PUTENV 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "putenv.$ac_objext"   | \
++  *" putenv.$ac_objext"   | \
++    "putenv.$ac_objext "* | \
++  *" putenv.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS putenv.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for rcmd" >&5
++echo $ECHO_N "checking for rcmd... $ECHO_C" >&6
++if test "${ac_cv_func_rcmd+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define rcmd to an innocuous variant, in case <limits.h> declares rcmd.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define rcmd innocuous_rcmd
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char rcmd (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef rcmd
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char rcmd ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_rcmd) || defined (__stub___rcmd)
++choke me
++#else
++char (*f) () = rcmd;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != rcmd;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_rcmd=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_rcmd=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_rcmd" >&5
++echo "${ECHO_T}$ac_cv_func_rcmd" >&6
++if test $ac_cv_func_rcmd = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_RCMD 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "rcmd.$ac_objext"   | \
++  *" rcmd.$ac_objext"   | \
++    "rcmd.$ac_objext "* | \
++  *" rcmd.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS rcmd.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for readv" >&5
++echo $ECHO_N "checking for readv... $ECHO_C" >&6
++if test "${ac_cv_func_readv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define readv to an innocuous variant, in case <limits.h> declares readv.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define readv innocuous_readv
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char readv (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef readv
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char readv ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_readv) || defined (__stub___readv)
++choke me
++#else
++char (*f) () = readv;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != readv;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_readv=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_readv=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_readv" >&5
++echo "${ECHO_T}$ac_cv_func_readv" >&6
++if test $ac_cv_func_readv = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_READV 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "readv.$ac_objext"   | \
++  *" readv.$ac_objext"   | \
++    "readv.$ac_objext "* | \
++  *" readv.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS readv.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for recvmsg" >&5
++echo $ECHO_N "checking for recvmsg... $ECHO_C" >&6
++if test "${ac_cv_func_recvmsg+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define recvmsg to an innocuous variant, in case <limits.h> declares recvmsg.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define recvmsg innocuous_recvmsg
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char recvmsg (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef recvmsg
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char recvmsg ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_recvmsg) || defined (__stub___recvmsg)
++choke me
++#else
++char (*f) () = recvmsg;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != recvmsg;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_recvmsg=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_recvmsg=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_recvmsg" >&5
++echo "${ECHO_T}$ac_cv_func_recvmsg" >&6
++if test $ac_cv_func_recvmsg = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_RECVMSG 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "recvmsg.$ac_objext"   | \
++  *" recvmsg.$ac_objext"   | \
++    "recvmsg.$ac_objext "* | \
++  *" recvmsg.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS recvmsg.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for sendmsg" >&5
++echo $ECHO_N "checking for sendmsg... $ECHO_C" >&6
++if test "${ac_cv_func_sendmsg+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define sendmsg to an innocuous variant, in case <limits.h> declares sendmsg.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define sendmsg innocuous_sendmsg
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char sendmsg (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef sendmsg
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char sendmsg ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_sendmsg) || defined (__stub___sendmsg)
++choke me
++#else
++char (*f) () = sendmsg;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != sendmsg;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_sendmsg=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_sendmsg=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_sendmsg" >&5
++echo "${ECHO_T}$ac_cv_func_sendmsg" >&6
++if test $ac_cv_func_sendmsg = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SENDMSG 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "sendmsg.$ac_objext"   | \
++  *" sendmsg.$ac_objext"   | \
++    "sendmsg.$ac_objext "* | \
++  *" sendmsg.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS sendmsg.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for setegid" >&5
++echo $ECHO_N "checking for setegid... $ECHO_C" >&6
++if test "${ac_cv_func_setegid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define setegid to an innocuous variant, in case <limits.h> declares setegid.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define setegid innocuous_setegid
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char setegid (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef setegid
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char setegid ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_setegid) || defined (__stub___setegid)
++choke me
++#else
++char (*f) () = setegid;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != setegid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_setegid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_setegid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_setegid" >&5
++echo "${ECHO_T}$ac_cv_func_setegid" >&6
++if test $ac_cv_func_setegid = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SETEGID 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "setegid.$ac_objext"   | \
++  *" setegid.$ac_objext"   | \
++    "setegid.$ac_objext "* | \
++  *" setegid.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS setegid.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for setenv" >&5
++echo $ECHO_N "checking for setenv... $ECHO_C" >&6
++if test "${ac_cv_func_setenv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define setenv to an innocuous variant, in case <limits.h> declares setenv.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define setenv innocuous_setenv
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char setenv (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef setenv
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char setenv ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_setenv) || defined (__stub___setenv)
++choke me
++#else
++char (*f) () = setenv;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != setenv;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_setenv=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_setenv=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_setenv" >&5
++echo "${ECHO_T}$ac_cv_func_setenv" >&6
++if test $ac_cv_func_setenv = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SETENV 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "setenv.$ac_objext"   | \
++  *" setenv.$ac_objext"   | \
++    "setenv.$ac_objext "* | \
++  *" setenv.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS setenv.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for seteuid" >&5
++echo $ECHO_N "checking for seteuid... $ECHO_C" >&6
++if test "${ac_cv_func_seteuid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define seteuid to an innocuous variant, in case <limits.h> declares seteuid.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define seteuid innocuous_seteuid
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char seteuid (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef seteuid
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char seteuid ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_seteuid) || defined (__stub___seteuid)
++choke me
++#else
++char (*f) () = seteuid;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != seteuid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_seteuid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_seteuid=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_seteuid" >&5
++echo "${ECHO_T}$ac_cv_func_seteuid" >&6
++if test $ac_cv_func_seteuid = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SETEUID 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "seteuid.$ac_objext"   | \
++  *" seteuid.$ac_objext"   | \
++    "seteuid.$ac_objext "* | \
++  *" seteuid.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS seteuid.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strcasecmp" >&5
++echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6
++if test "${ac_cv_func_strcasecmp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strcasecmp to an innocuous variant, in case <limits.h> declares strcasecmp.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strcasecmp innocuous_strcasecmp
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strcasecmp (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strcasecmp
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strcasecmp ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strcasecmp) || defined (__stub___strcasecmp)
++choke me
++#else
++char (*f) () = strcasecmp;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strcasecmp;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strcasecmp=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strcasecmp=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5
++echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6
++if test $ac_cv_func_strcasecmp = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRCASECMP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strcasecmp.$ac_objext"   | \
++  *" strcasecmp.$ac_objext"   | \
++    "strcasecmp.$ac_objext "* | \
++  *" strcasecmp.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strcasecmp.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strdup" >&5
++echo $ECHO_N "checking for strdup... $ECHO_C" >&6
++if test "${ac_cv_func_strdup+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strdup to an innocuous variant, in case <limits.h> declares strdup.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strdup innocuous_strdup
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strdup (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strdup
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strdup ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strdup) || defined (__stub___strdup)
++choke me
++#else
++char (*f) () = strdup;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strdup;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strdup=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strdup=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strdup" >&5
++echo "${ECHO_T}$ac_cv_func_strdup" >&6
++if test $ac_cv_func_strdup = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRDUP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strdup.$ac_objext"   | \
++  *" strdup.$ac_objext"   | \
++    "strdup.$ac_objext "* | \
++  *" strdup.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strdup.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strerror" >&5
++echo $ECHO_N "checking for strerror... $ECHO_C" >&6
++if test "${ac_cv_func_strerror+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strerror to an innocuous variant, in case <limits.h> declares strerror.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strerror innocuous_strerror
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strerror (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strerror
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strerror ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strerror) || defined (__stub___strerror)
++choke me
++#else
++char (*f) () = strerror;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strerror;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strerror=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strerror=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
++echo "${ECHO_T}$ac_cv_func_strerror" >&6
++if test $ac_cv_func_strerror = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRERROR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strerror.$ac_objext"   | \
++  *" strerror.$ac_objext"   | \
++    "strerror.$ac_objext "* | \
++  *" strerror.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strerror.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strftime" >&5
++echo $ECHO_N "checking for strftime... $ECHO_C" >&6
++if test "${ac_cv_func_strftime+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strftime to an innocuous variant, in case <limits.h> declares strftime.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strftime innocuous_strftime
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strftime (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strftime
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strftime ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strftime) || defined (__stub___strftime)
++choke me
++#else
++char (*f) () = strftime;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strftime;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strftime=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strftime=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strftime" >&5
++echo "${ECHO_T}$ac_cv_func_strftime" >&6
++if test $ac_cv_func_strftime = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRFTIME 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strftime.$ac_objext"   | \
++  *" strftime.$ac_objext"   | \
++    "strftime.$ac_objext "* | \
++  *" strftime.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strftime.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strlcat" >&5
++echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
++if test "${ac_cv_func_strlcat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strlcat to an innocuous variant, in case <limits.h> declares strlcat.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strlcat innocuous_strlcat
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strlcat (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strlcat
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strlcat ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strlcat) || defined (__stub___strlcat)
++choke me
++#else
++char (*f) () = strlcat;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strlcat;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strlcat=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strlcat=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strlcat" >&5
++echo "${ECHO_T}$ac_cv_func_strlcat" >&6
++if test $ac_cv_func_strlcat = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRLCAT 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strlcat.$ac_objext"   | \
++  *" strlcat.$ac_objext"   | \
++    "strlcat.$ac_objext "* | \
++  *" strlcat.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strlcat.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strlcpy" >&5
++echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
++if test "${ac_cv_func_strlcpy+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strlcpy to an innocuous variant, in case <limits.h> declares strlcpy.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strlcpy innocuous_strlcpy
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strlcpy (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strlcpy
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strlcpy ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strlcpy) || defined (__stub___strlcpy)
++choke me
++#else
++char (*f) () = strlcpy;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strlcpy;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strlcpy=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strlcpy=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strlcpy" >&5
++echo "${ECHO_T}$ac_cv_func_strlcpy" >&6
++if test $ac_cv_func_strlcpy = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRLCPY 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strlcpy.$ac_objext"   | \
++  *" strlcpy.$ac_objext"   | \
++    "strlcpy.$ac_objext "* | \
++  *" strlcpy.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strlcpy.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strlwr" >&5
++echo $ECHO_N "checking for strlwr... $ECHO_C" >&6
++if test "${ac_cv_func_strlwr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strlwr to an innocuous variant, in case <limits.h> declares strlwr.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strlwr innocuous_strlwr
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strlwr (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strlwr
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strlwr ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strlwr) || defined (__stub___strlwr)
++choke me
++#else
++char (*f) () = strlwr;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strlwr;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strlwr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strlwr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strlwr" >&5
++echo "${ECHO_T}$ac_cv_func_strlwr" >&6
++if test $ac_cv_func_strlwr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRLWR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strlwr.$ac_objext"   | \
++  *" strlwr.$ac_objext"   | \
++    "strlwr.$ac_objext "* | \
++  *" strlwr.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strlwr.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strncasecmp" >&5
++echo $ECHO_N "checking for strncasecmp... $ECHO_C" >&6
++if test "${ac_cv_func_strncasecmp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strncasecmp to an innocuous variant, in case <limits.h> declares strncasecmp.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strncasecmp innocuous_strncasecmp
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strncasecmp (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strncasecmp
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strncasecmp ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strncasecmp) || defined (__stub___strncasecmp)
++choke me
++#else
++char (*f) () = strncasecmp;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strncasecmp;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strncasecmp=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strncasecmp=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strncasecmp" >&5
++echo "${ECHO_T}$ac_cv_func_strncasecmp" >&6
++if test $ac_cv_func_strncasecmp = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRNCASECMP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strncasecmp.$ac_objext"   | \
++  *" strncasecmp.$ac_objext"   | \
++    "strncasecmp.$ac_objext "* | \
++  *" strncasecmp.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strncasecmp.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strndup" >&5
++echo $ECHO_N "checking for strndup... $ECHO_C" >&6
++if test "${ac_cv_func_strndup+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strndup to an innocuous variant, in case <limits.h> declares strndup.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strndup innocuous_strndup
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strndup (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strndup
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strndup ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strndup) || defined (__stub___strndup)
++choke me
++#else
++char (*f) () = strndup;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strndup;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strndup=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strndup=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strndup" >&5
++echo "${ECHO_T}$ac_cv_func_strndup" >&6
++if test $ac_cv_func_strndup = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRNDUP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strndup.$ac_objext"   | \
++  *" strndup.$ac_objext"   | \
++    "strndup.$ac_objext "* | \
++  *" strndup.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strndup.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strnlen" >&5
++echo $ECHO_N "checking for strnlen... $ECHO_C" >&6
++if test "${ac_cv_func_strnlen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strnlen to an innocuous variant, in case <limits.h> declares strnlen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strnlen innocuous_strnlen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strnlen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strnlen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strnlen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strnlen) || defined (__stub___strnlen)
++choke me
++#else
++char (*f) () = strnlen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strnlen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strnlen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strnlen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strnlen" >&5
++echo "${ECHO_T}$ac_cv_func_strnlen" >&6
++if test $ac_cv_func_strnlen = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRNLEN 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strnlen.$ac_objext"   | \
++  *" strnlen.$ac_objext"   | \
++    "strnlen.$ac_objext "* | \
++  *" strnlen.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strnlen.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strptime" >&5
++echo $ECHO_N "checking for strptime... $ECHO_C" >&6
++if test "${ac_cv_func_strptime+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strptime innocuous_strptime
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strptime (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strptime
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strptime ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strptime) || defined (__stub___strptime)
++choke me
++#else
++char (*f) () = strptime;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strptime;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strptime=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strptime=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
++echo "${ECHO_T}$ac_cv_func_strptime" >&6
++if test $ac_cv_func_strptime = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRPTIME 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strptime.$ac_objext"   | \
++  *" strptime.$ac_objext"   | \
++    "strptime.$ac_objext "* | \
++  *" strptime.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strptime.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strsep" >&5
++echo $ECHO_N "checking for strsep... $ECHO_C" >&6
++if test "${ac_cv_func_strsep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strsep to an innocuous variant, in case <limits.h> declares strsep.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strsep innocuous_strsep
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strsep (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strsep
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strsep ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strsep) || defined (__stub___strsep)
++choke me
++#else
++char (*f) () = strsep;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strsep;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strsep=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strsep=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strsep" >&5
++echo "${ECHO_T}$ac_cv_func_strsep" >&6
++if test $ac_cv_func_strsep = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRSEP 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strsep.$ac_objext"   | \
++  *" strsep.$ac_objext"   | \
++    "strsep.$ac_objext "* | \
++  *" strsep.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strsep.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strsep_copy" >&5
++echo $ECHO_N "checking for strsep_copy... $ECHO_C" >&6
++if test "${ac_cv_func_strsep_copy+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strsep_copy to an innocuous variant, in case <limits.h> declares strsep_copy.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strsep_copy innocuous_strsep_copy
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strsep_copy (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strsep_copy
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strsep_copy ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strsep_copy) || defined (__stub___strsep_copy)
++choke me
++#else
++char (*f) () = strsep_copy;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strsep_copy;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strsep_copy=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strsep_copy=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strsep_copy" >&5
++echo "${ECHO_T}$ac_cv_func_strsep_copy" >&6
++if test $ac_cv_func_strsep_copy = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRSEP_COPY 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strsep_copy.$ac_objext"   | \
++  *" strsep_copy.$ac_objext"   | \
++    "strsep_copy.$ac_objext "* | \
++  *" strsep_copy.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strsep_copy.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strtok_r" >&5
++echo $ECHO_N "checking for strtok_r... $ECHO_C" >&6
++if test "${ac_cv_func_strtok_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strtok_r to an innocuous variant, in case <limits.h> declares strtok_r.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strtok_r innocuous_strtok_r
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strtok_r (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strtok_r
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strtok_r ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strtok_r) || defined (__stub___strtok_r)
++choke me
++#else
++char (*f) () = strtok_r;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strtok_r;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strtok_r=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strtok_r=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strtok_r" >&5
++echo "${ECHO_T}$ac_cv_func_strtok_r" >&6
++if test $ac_cv_func_strtok_r = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRTOK_R 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strtok_r.$ac_objext"   | \
++  *" strtok_r.$ac_objext"   | \
++    "strtok_r.$ac_objext "* | \
++  *" strtok_r.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strtok_r.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for strupr" >&5
++echo $ECHO_N "checking for strupr... $ECHO_C" >&6
++if test "${ac_cv_func_strupr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define strupr to an innocuous variant, in case <limits.h> declares strupr.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define strupr innocuous_strupr
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char strupr (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef strupr
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char strupr ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_strupr) || defined (__stub___strupr)
++choke me
++#else
++char (*f) () = strupr;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != strupr;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_strupr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_strupr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strupr" >&5
++echo "${ECHO_T}$ac_cv_func_strupr" >&6
++if test $ac_cv_func_strupr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUPR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "strupr.$ac_objext"   | \
++  *" strupr.$ac_objext"   | \
++    "strupr.$ac_objext "* | \
++  *" strupr.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS strupr.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for swab" >&5
++echo $ECHO_N "checking for swab... $ECHO_C" >&6
++if test "${ac_cv_func_swab+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define swab to an innocuous variant, in case <limits.h> declares swab.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define swab innocuous_swab
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char swab (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef swab
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char swab ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_swab) || defined (__stub___swab)
++choke me
++#else
++char (*f) () = swab;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != swab;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_swab=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_swab=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_swab" >&5
++echo "${ECHO_T}$ac_cv_func_swab" >&6
++if test $ac_cv_func_swab = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SWAB 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "swab.$ac_objext"   | \
++  *" swab.$ac_objext"   | \
++    "swab.$ac_objext "* | \
++  *" swab.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS swab.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for unsetenv" >&5
++echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6
++if test "${ac_cv_func_unsetenv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define unsetenv to an innocuous variant, in case <limits.h> declares unsetenv.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define unsetenv innocuous_unsetenv
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char unsetenv (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef unsetenv
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char unsetenv ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_unsetenv) || defined (__stub___unsetenv)
++choke me
++#else
++char (*f) () = unsetenv;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != unsetenv;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_unsetenv=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_unsetenv=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_unsetenv" >&5
++echo "${ECHO_T}$ac_cv_func_unsetenv" >&6
++if test $ac_cv_func_unsetenv = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_UNSETENV 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "unsetenv.$ac_objext"   | \
++  *" unsetenv.$ac_objext"   | \
++    "unsetenv.$ac_objext "* | \
++  *" unsetenv.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS unsetenv.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for verr" >&5
++echo $ECHO_N "checking for verr... $ECHO_C" >&6
++if test "${ac_cv_func_verr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define verr to an innocuous variant, in case <limits.h> declares verr.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define verr innocuous_verr
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char verr (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef verr
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char verr ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_verr) || defined (__stub___verr)
++choke me
++#else
++char (*f) () = verr;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != verr;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_verr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_verr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_verr" >&5
++echo "${ECHO_T}$ac_cv_func_verr" >&6
++if test $ac_cv_func_verr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_VERR 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "verr.$ac_objext"   | \
++  *" verr.$ac_objext"   | \
++    "verr.$ac_objext "* | \
++  *" verr.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS verr.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for verrx" >&5
++echo $ECHO_N "checking for verrx... $ECHO_C" >&6
++if test "${ac_cv_func_verrx+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define verrx to an innocuous variant, in case <limits.h> declares verrx.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define verrx innocuous_verrx
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char verrx (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef verrx
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char verrx ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_verrx) || defined (__stub___verrx)
++choke me
++#else
++char (*f) () = verrx;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != verrx;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_verrx=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_verrx=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_verrx" >&5
++echo "${ECHO_T}$ac_cv_func_verrx" >&6
++if test $ac_cv_func_verrx = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_VERRX 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "verrx.$ac_objext"   | \
++  *" verrx.$ac_objext"   | \
++    "verrx.$ac_objext "* | \
++  *" verrx.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS verrx.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for vsyslog" >&5
++echo $ECHO_N "checking for vsyslog... $ECHO_C" >&6
++if test "${ac_cv_func_vsyslog+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define vsyslog to an innocuous variant, in case <limits.h> declares vsyslog.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define vsyslog innocuous_vsyslog
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char vsyslog (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef vsyslog
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char vsyslog ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_vsyslog) || defined (__stub___vsyslog)
++choke me
++#else
++char (*f) () = vsyslog;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != vsyslog;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_vsyslog=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_vsyslog=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vsyslog" >&5
++echo "${ECHO_T}$ac_cv_func_vsyslog" >&6
++if test $ac_cv_func_vsyslog = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_VSYSLOG 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "vsyslog.$ac_objext"   | \
++  *" vsyslog.$ac_objext"   | \
++    "vsyslog.$ac_objext "* | \
++  *" vsyslog.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS vsyslog.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for vwarn" >&5
++echo $ECHO_N "checking for vwarn... $ECHO_C" >&6
++if test "${ac_cv_func_vwarn+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define vwarn to an innocuous variant, in case <limits.h> declares vwarn.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define vwarn innocuous_vwarn
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char vwarn (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef vwarn
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char vwarn ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_vwarn) || defined (__stub___vwarn)
++choke me
++#else
++char (*f) () = vwarn;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != vwarn;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_vwarn=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_vwarn=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vwarn" >&5
++echo "${ECHO_T}$ac_cv_func_vwarn" >&6
++if test $ac_cv_func_vwarn = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_VWARN 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "vwarn.$ac_objext"   | \
++  *" vwarn.$ac_objext"   | \
++    "vwarn.$ac_objext "* | \
++  *" vwarn.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS vwarn.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for vwarnx" >&5
++echo $ECHO_N "checking for vwarnx... $ECHO_C" >&6
++if test "${ac_cv_func_vwarnx+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define vwarnx to an innocuous variant, in case <limits.h> declares vwarnx.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define vwarnx innocuous_vwarnx
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char vwarnx (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef vwarnx
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char vwarnx ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_vwarnx) || defined (__stub___vwarnx)
++choke me
++#else
++char (*f) () = vwarnx;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != vwarnx;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_vwarnx=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_vwarnx=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vwarnx" >&5
++echo "${ECHO_T}$ac_cv_func_vwarnx" >&6
++if test $ac_cv_func_vwarnx = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_VWARNX 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "vwarnx.$ac_objext"   | \
++  *" vwarnx.$ac_objext"   | \
++    "vwarnx.$ac_objext "* | \
++  *" vwarnx.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS vwarnx.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for warn" >&5
++echo $ECHO_N "checking for warn... $ECHO_C" >&6
++if test "${ac_cv_func_warn+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define warn to an innocuous variant, in case <limits.h> declares warn.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define warn innocuous_warn
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char warn (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef warn
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char warn ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_warn) || defined (__stub___warn)
++choke me
++#else
++char (*f) () = warn;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != warn;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_warn=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_warn=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_warn" >&5
++echo "${ECHO_T}$ac_cv_func_warn" >&6
++if test $ac_cv_func_warn = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_WARN 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "warn.$ac_objext"   | \
++  *" warn.$ac_objext"   | \
++    "warn.$ac_objext "* | \
++  *" warn.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS warn.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for warnx" >&5
++echo $ECHO_N "checking for warnx... $ECHO_C" >&6
++if test "${ac_cv_func_warnx+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define warnx to an innocuous variant, in case <limits.h> declares warnx.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define warnx innocuous_warnx
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char warnx (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef warnx
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char warnx ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_warnx) || defined (__stub___warnx)
++choke me
++#else
++char (*f) () = warnx;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != warnx;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_warnx=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_warnx=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_warnx" >&5
++echo "${ECHO_T}$ac_cv_func_warnx" >&6
++if test $ac_cv_func_warnx = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_WARNX 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "warnx.$ac_objext"   | \
++  *" warnx.$ac_objext"   | \
++    "warnx.$ac_objext "* | \
++  *" warnx.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS warnx.$ac_objext" ;;
++esac
++
++fi
++echo "$as_me:$LINENO: checking for writev" >&5
++echo $ECHO_N "checking for writev... $ECHO_C" >&6
++if test "${ac_cv_func_writev+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define writev to an innocuous variant, in case <limits.h> declares writev.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define writev innocuous_writev
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char writev (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef writev
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char writev ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_writev) || defined (__stub___writev)
++choke me
++#else
++char (*f) () = writev;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != writev;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_writev=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_writev=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_writev" >&5
++echo "${ECHO_T}$ac_cv_func_writev" >&6
++if test $ac_cv_func_writev = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_WRITEV 1
++_ACEOF
++
++else
++  case $LIB@&t@OBJS in
++    "writev.$ac_objext"   | \
++  *" writev.$ac_objext"   | \
++    "writev.$ac_objext "* | \
++  *" writev.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS writev.$ac_objext" ;;
++esac
++
++fi
++
++
++
++if test "$ac_cv_func_strndup+set" != set -o "$ac_cv_func_strndup" = yes; then
++echo "$as_me:$LINENO: checking if strndup needs a prototype" >&5
++echo $ECHO_N "checking if strndup needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strndup_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strndup (struct foo*);
++strndup(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strndup_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strndup_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strndup_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strndup_noproto" >&6
++if test "$ac_cv_func_strndup_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRNDUP_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_strsep+set" != set -o "$ac_cv_func_strsep" = yes; then
++echo "$as_me:$LINENO: checking if strsep needs a prototype" >&5
++echo $ECHO_N "checking if strsep needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strsep_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strsep (struct foo*);
++strsep(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strsep_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strsep_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strsep_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strsep_noproto" >&6
++if test "$ac_cv_func_strsep_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRSEP_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_strtok_r+set" != set -o "$ac_cv_func_strtok_r" = yes; then
++echo "$as_me:$LINENO: checking if strtok_r needs a prototype" >&5
++echo $ECHO_N "checking if strtok_r needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strtok_r_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strtok_r (struct foo*);
++strtok_r(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strtok_r_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strtok_r_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strtok_r_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strtok_r_noproto" >&6
++if test "$ac_cv_func_strtok_r_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRTOK_R_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++
++if test "$ac_cv_func_strsvis+set" != set -o "$ac_cv_func_strsvis" = yes; then
++echo "$as_me:$LINENO: checking if strsvis needs a prototype" >&5
++echo $ECHO_N "checking if strsvis needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strsvis_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strsvis (struct foo*);
++strsvis(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strsvis_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strsvis_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strsvis_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strsvis_noproto" >&6
++if test "$ac_cv_func_strsvis_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRSVIS_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_strunvis+set" != set -o "$ac_cv_func_strunvis" = yes; then
++echo "$as_me:$LINENO: checking if strunvis needs a prototype" >&5
++echo $ECHO_N "checking if strunvis needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strunvis_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strunvis (struct foo*);
++strunvis(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strunvis_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strunvis_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strunvis_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strunvis_noproto" >&6
++if test "$ac_cv_func_strunvis_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRUNVIS_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_strvis+set" != set -o "$ac_cv_func_strvis" = yes; then
++echo "$as_me:$LINENO: checking if strvis needs a prototype" >&5
++echo $ECHO_N "checking if strvis needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strvis_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strvis (struct foo*);
++strvis(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strvis_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strvis_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strvis_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strvis_noproto" >&6
++if test "$ac_cv_func_strvis_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRVIS_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_strvisx+set" != set -o "$ac_cv_func_strvisx" = yes; then
++echo "$as_me:$LINENO: checking if strvisx needs a prototype" >&5
++echo $ECHO_N "checking if strvisx needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_strvisx_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int strvisx (struct foo*);
++strvisx(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_strvisx_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_strvisx_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_strvisx_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_strvisx_noproto" >&6
++if test "$ac_cv_func_strvisx_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_STRVISX_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_svis+set" != set -o "$ac_cv_func_svis" = yes; then
++echo "$as_me:$LINENO: checking if svis needs a prototype" >&5
++echo $ECHO_N "checking if svis needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_svis_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int svis (struct foo*);
++svis(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_svis_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_svis_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_svis_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_svis_noproto" >&6
++if test "$ac_cv_func_svis_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_SVIS_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_unvis+set" != set -o "$ac_cv_func_unvis" = yes; then
++echo "$as_me:$LINENO: checking if unvis needs a prototype" >&5
++echo $ECHO_N "checking if unvis needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_unvis_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int unvis (struct foo*);
++unvis(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_unvis_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_unvis_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_unvis_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_unvis_noproto" >&6
++if test "$ac_cv_func_unvis_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_UNVIS_PROTO 1
++_ACEOF
++
++fi
++fi
++
++if test "$ac_cv_func_vis+set" != set -o "$ac_cv_func_vis" = yes; then
++echo "$as_me:$LINENO: checking if vis needs a prototype" >&5
++echo $ECHO_N "checking if vis needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_vis_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_VIS_H
++#include <vis.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int vis (struct foo*);
++vis(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_vis_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_vis_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_vis_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_vis_noproto" >&6
++if test "$ac_cv_func_vis_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_VIS_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++echo "$as_me:$LINENO: checking for inet_aton" >&5
++echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6
++if test "${ac_cv_func_inet_aton+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++int
++main ()
++{
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_inet_aton) || defined (__stub___inet_aton)
++choke me
++#else
++inet_aton(0,0)
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_inet_aton=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_inet_aton=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++if eval "test \"\${ac_cv_func_inet_aton}\" = yes"; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INET_ATON 1
++_ACEOF
++
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  case $LIB@&t@OBJS in
++    "inet_aton.$ac_objext"   | \
++  *" inet_aton.$ac_objext"   | \
++    "inet_aton.$ac_objext "* | \
++  *" inet_aton.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS inet_aton.$ac_objext" ;;
++esac
++
++fi
++
++echo "$as_me:$LINENO: checking for inet_ntop" >&5
++echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6
++if test "${ac_cv_func_inet_ntop+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++int
++main ()
++{
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_inet_ntop) || defined (__stub___inet_ntop)
++choke me
++#else
++inet_ntop(0, 0, 0, 0)
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_inet_ntop=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_inet_ntop=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++if eval "test \"\${ac_cv_func_inet_ntop}\" = yes"; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INET_NTOP 1
++_ACEOF
++
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  case $LIB@&t@OBJS in
++    "inet_ntop.$ac_objext"   | \
++  *" inet_ntop.$ac_objext"   | \
++    "inet_ntop.$ac_objext "* | \
++  *" inet_ntop.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS inet_ntop.$ac_objext" ;;
++esac
++
++fi
++
++echo "$as_me:$LINENO: checking for inet_pton" >&5
++echo $ECHO_N "checking for inet_pton... $ECHO_C" >&6
++if test "${ac_cv_func_inet_pton+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++int
++main ()
++{
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_inet_pton) || defined (__stub___inet_pton)
++choke me
++#else
++inet_pton(0,0,0)
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_inet_pton=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_inet_pton=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++if eval "test \"\${ac_cv_func_inet_pton}\" = yes"; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INET_PTON 1
++_ACEOF
++
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  case $LIB@&t@OBJS in
++    "inet_pton.$ac_objext"   | \
++  *" inet_pton.$ac_objext"   | \
++    "inet_pton.$ac_objext "* | \
++  *" inet_pton.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS inet_pton.$ac_objext" ;;
++esac
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking for sa_len in struct sockaddr" >&5
++echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
++if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr x; x.sa_len;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_sockaddr_sa_len=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_sockaddr_sa_len=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
++echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
++if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_SOCKADDR_SA_LEN 1
++_ACEOF
++
++	
++fi
++
++
++
++if test "$ac_cv_func_getnameinfo" = "yes"; then
++  
++echo "$as_me:$LINENO: checking if getnameinfo is broken" >&5
++echo $ECHO_N "checking if getnameinfo is broken... $ECHO_C" >&6
++if test "${ac_cv_func_getnameinfo_broken+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <netdb.h>
++
++int
++main(int argc, char **argv)
++{
++  struct sockaddr_in sin;
++  char host[256];
++  memset(&sin, 0, sizeof(sin));
++#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
++  sin.sin_len = sizeof(sin);
++#endif
++  sin.sin_family = AF_INET;
++  sin.sin_addr.s_addr = 0xffffffff;
++  sin.sin_port = 0;
++  return getnameinfo((struct sockaddr*)&sin, sizeof(sin), host, sizeof(host),
++	      NULL, 0, 0);
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getnameinfo_broken=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_getnameinfo_broken=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo_broken" >&5
++echo "${ECHO_T}$ac_cv_func_getnameinfo_broken" >&6
++  if test "$ac_cv_func_getnameinfo_broken" = yes; then
++	case $LIB@&t@OBJS in
++    "getnameinfo.$ac_objext"   | \
++  *" getnameinfo.$ac_objext"   | \
++    "getnameinfo.$ac_objext "* | \
++  *" getnameinfo.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getnameinfo.$ac_objext" ;;
++esac
++
++  fi
++fi
++
++if test "$ac_cv_func_getaddrinfo" = "yes"; then
++  
++echo "$as_me:$LINENO: checking if getaddrinfo handles numeric services" >&5
++echo $ECHO_N "checking if getaddrinfo handles numeric services... $ECHO_C" >&6
++if test "${ac_cv_func_getaddrinfo_numserv+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netdb.h>
++
++int
++main(int argc, char **argv)
++{
++	struct addrinfo hints, *ai;
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_flags = AI_PASSIVE;
++	hints.ai_socktype = SOCK_STREAM;
++	hints.ai_family = PF_UNSPEC;
++	if(getaddrinfo(NULL, "17", &hints, &ai) != 0)
++		return 1;
++	return 0;
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getaddrinfo_numserv=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_getaddrinfo_numserv=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo_numserv" >&5
++echo "${ECHO_T}$ac_cv_func_getaddrinfo_numserv" >&6
++  if test "$ac_cv_func_getaddrinfo_numserv" = no; then
++	case $LIB@&t@OBJS in
++    "getaddrinfo.$ac_objext"   | \
++  *" getaddrinfo.$ac_objext"   | \
++    "getaddrinfo.$ac_objext "* | \
++  *" getaddrinfo.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS getaddrinfo.$ac_objext" ;;
++esac
++
++	case $LIB@&t@OBJS in
++    "freeaddrinfo.$ac_objext"   | \
++  *" freeaddrinfo.$ac_objext"   | \
++    "freeaddrinfo.$ac_objext "* | \
++  *" freeaddrinfo.$ac_objext "* ) ;;
++  *) LIB@&t@OBJS="$LIB@&t@OBJS freeaddrinfo.$ac_objext" ;;
++esac
++
++  fi
++fi
++
++
++if test "$ac_cv_func_setenv+set" != set -o "$ac_cv_func_setenv" = yes; then
++echo "$as_me:$LINENO: checking if setenv needs a prototype" >&5
++echo $ECHO_N "checking if setenv needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_setenv_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int setenv (struct foo*);
++setenv(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_setenv_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_setenv_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_setenv_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_setenv_noproto" >&6
++if test "$ac_cv_func_setenv_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_SETENV_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++if test "$ac_cv_func_unsetenv+set" != set -o "$ac_cv_func_unsetenv" = yes; then
++echo "$as_me:$LINENO: checking if unsetenv needs a prototype" >&5
++echo $ECHO_N "checking if unsetenv needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_unsetenv_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int unsetenv (struct foo*);
++unsetenv(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_unsetenv_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_unsetenv_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_unsetenv_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_unsetenv_noproto" >&6
++if test "$ac_cv_func_unsetenv_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_UNSETENV_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++if test "$ac_cv_func_gethostname+set" != set -o "$ac_cv_func_gethostname" = yes; then
++echo "$as_me:$LINENO: checking if gethostname needs a prototype" >&5
++echo $ECHO_N "checking if gethostname needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_gethostname_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <unistd.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int gethostname (struct foo*);
++gethostname(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_gethostname_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_gethostname_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostname_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_gethostname_noproto" >&6
++if test "$ac_cv_func_gethostname_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_GETHOSTNAME_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++if test "$ac_cv_func_mkstemp+set" != set -o "$ac_cv_func_mkstemp" = yes; then
++echo "$as_me:$LINENO: checking if mkstemp needs a prototype" >&5
++echo $ECHO_N "checking if mkstemp needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_mkstemp_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <unistd.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int mkstemp (struct foo*);
++mkstemp(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_mkstemp_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_mkstemp_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_mkstemp_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_mkstemp_noproto" >&6
++if test "$ac_cv_func_mkstemp_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_MKSTEMP_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++if test "$ac_cv_func_getusershell+set" != set -o "$ac_cv_func_getusershell" = yes; then
++echo "$as_me:$LINENO: checking if getusershell needs a prototype" >&5
++echo $ECHO_N "checking if getusershell needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_getusershell_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <unistd.h>
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int getusershell (struct foo*);
++getusershell(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_getusershell_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_getusershell_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getusershell_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_getusershell_noproto" >&6
++if test "$ac_cv_func_getusershell_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_GETUSERSHELL_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++
++if test "$ac_cv_func_inet_aton+set" != set -o "$ac_cv_func_inet_aton" = yes; then
++echo "$as_me:$LINENO: checking if inet_aton needs a prototype" >&5
++echo $ECHO_N "checking if inet_aton needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_inet_aton_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int inet_aton (struct foo*);
++inet_aton(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_inet_aton_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_inet_aton_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_inet_aton_noproto" >&6
++if test "$ac_cv_func_inet_aton_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_INET_ATON_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++
++
++
++echo "$as_me:$LINENO: checking for crypt" >&5
++echo $ECHO_N "checking for crypt... $ECHO_C" >&6
++if test "${ac_cv_funclib_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_crypt\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" crypt; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++crypt()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_crypt=\${ac_cv_funclib_crypt-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_crypt"
++
++if false; then
++	
++for ac_func in crypt
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# crypt
++eval "ac_tr_func=HAVE_`echo crypt | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_crypt=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_crypt=yes"
++	eval "LIB_crypt="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_crypt=no"
++	eval "LIB_crypt="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_crypt=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking if gethostbyname is compatible with system prototype" >&5
++echo $ECHO_N "checking if gethostbyname is compatible with system prototype... $ECHO_C" >&6
++if test "${ac_cv_func_gethostbyname_proto_compat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++
++int
++main ()
++{
++struct hostent *gethostbyname(const char *);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_gethostbyname_proto_compat=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_gethostbyname_proto_compat=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname_proto_compat" >&5
++echo "${ECHO_T}$ac_cv_func_gethostbyname_proto_compat" >&6
++
++if test "$ac_cv_func_gethostbyname_proto_compat" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define GETHOSTBYNAME_PROTO_COMPATIBLE 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking if gethostbyaddr is compatible with system prototype" >&5
++echo $ECHO_N "checking if gethostbyaddr is compatible with system prototype... $ECHO_C" >&6
++if test "${ac_cv_func_gethostbyaddr_proto_compat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++
++int
++main ()
++{
++struct hostent *gethostbyaddr(const void *, size_t, int);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_gethostbyaddr_proto_compat=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_gethostbyaddr_proto_compat=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
++echo "${ECHO_T}$ac_cv_func_gethostbyaddr_proto_compat" >&6
++
++if test "$ac_cv_func_gethostbyaddr_proto_compat" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define GETHOSTBYADDR_PROTO_COMPATIBLE 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking if getservbyname is compatible with system prototype" >&5
++echo $ECHO_N "checking if getservbyname is compatible with system prototype... $ECHO_C" >&6
++if test "${ac_cv_func_getservbyname_proto_compat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++#ifdef HAVE_ARPA_INET_H
++#include <arpa/inet.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++
++int
++main ()
++{
++struct servent *getservbyname(const char *, const char *);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_getservbyname_proto_compat=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_getservbyname_proto_compat=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getservbyname_proto_compat" >&5
++echo "${ECHO_T}$ac_cv_func_getservbyname_proto_compat" >&6
++
++if test "$ac_cv_func_getservbyname_proto_compat" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define GETSERVBYNAME_PROTO_COMPATIBLE 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking if getsockname is compatible with system prototype" >&5
++echo $ECHO_N "checking if getsockname is compatible with system prototype... $ECHO_C" >&6
++if test "${ac_cv_func_getsockname_proto_compat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++
++int
++main ()
++{
++int getsockname(int, struct sockaddr*, socklen_t*);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_getsockname_proto_compat=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_getsockname_proto_compat=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getsockname_proto_compat" >&5
++echo "${ECHO_T}$ac_cv_func_getsockname_proto_compat" >&6
++
++if test "$ac_cv_func_getsockname_proto_compat" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define GETSOCKNAME_PROTO_COMPATIBLE 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking if openlog is compatible with system prototype" >&5
++echo $ECHO_N "checking if openlog is compatible with system prototype... $ECHO_C" >&6
++if test "${ac_cv_func_openlog_proto_compat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_SYSLOG_H
++#include <syslog.h>
++#endif
++
++int
++main ()
++{
++void openlog(const char *, int, int);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_openlog_proto_compat=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_openlog_proto_compat=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_openlog_proto_compat" >&5
++echo "${ECHO_T}$ac_cv_func_openlog_proto_compat" >&6
++
++if test "$ac_cv_func_openlog_proto_compat" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define OPENLOG_PROTO_COMPATIBLE 1
++_ACEOF
++
++fi
++
++
++
++
++if test "$ac_cv_func_crypt+set" != set -o "$ac_cv_func_crypt" = yes; then
++echo "$as_me:$LINENO: checking if crypt needs a prototype" >&5
++echo $ECHO_N "checking if crypt needs a prototype... $ECHO_C" >&6
++if test "${ac_cv_func_crypt_noproto+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_CRYPT_H
++#include <crypt.h>
++#endif
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++int
++main ()
++{
++struct foo { int foo; } xx;
++extern int crypt (struct foo*);
++crypt(&xx);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_func_crypt_noproto=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_func_crypt_noproto=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_crypt_noproto" >&5
++echo "${ECHO_T}$ac_cv_func_crypt_noproto" >&6
++if test "$ac_cv_func_crypt_noproto" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NEED_CRYPT_PROTO 1
++_ACEOF
++
++fi
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for h_errno" >&5
++echo $ECHO_N "checking for h_errno... $ECHO_C" >&6
++if test "${ac_cv_var_h_errno+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++	void * foo() { return &h_errno; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_h_errno=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_h_errno=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var_h_errno" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int h_errno;
++int foo() { return h_errno; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_h_errno=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_h_errno=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var_h_errno`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_H_ERRNO 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if h_errno is properly declared" >&5
++echo $ECHO_N "checking if h_errno is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_h_errno_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++extern struct { int foo; } h_errno;
++int
++main ()
++{
++h_errno.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_h_errno_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_h_errno_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_h_errno_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_h_errno_declaration" >&6
++if eval "test \"\$ac_cv_var_h_errno_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_H_ERRNO_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking for h_errlist" >&5
++echo $ECHO_N "checking for h_errlist... $ECHO_C" >&6
++if test "${ac_cv_var_h_errlist+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++	void * foo() { return &h_errlist; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_h_errlist=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_h_errlist=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var_h_errlist" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int h_errlist;
++int foo() { return h_errlist; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_h_errlist=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_h_errlist=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var_h_errlist`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_H_ERRLIST 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if h_errlist is properly declared" >&5
++echo $ECHO_N "checking if h_errlist is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_h_errlist_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++extern struct { int foo; } h_errlist;
++int
++main ()
++{
++h_errlist.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_h_errlist_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_h_errlist_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_h_errlist_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_h_errlist_declaration" >&6
++if eval "test \"\$ac_cv_var_h_errlist_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_H_ERRLIST_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking for h_nerr" >&5
++echo $ECHO_N "checking for h_nerr... $ECHO_C" >&6
++if test "${ac_cv_var_h_nerr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++	void * foo() { return &h_nerr; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_h_nerr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_h_nerr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var_h_nerr" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int h_nerr;
++int foo() { return h_nerr; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_h_nerr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_h_nerr=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var_h_nerr`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_H_NERR 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if h_nerr is properly declared" >&5
++echo $ECHO_N "checking if h_nerr is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_h_nerr_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_NETDB_H
++#include <netdb.h>
++#endif
++extern struct { int foo; } h_nerr;
++int
++main ()
++{
++h_nerr.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_h_nerr_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_h_nerr_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_h_nerr_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_h_nerr_declaration" >&6
++if eval "test \"\$ac_cv_var_h_nerr_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_H_NERR_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking for __progname" >&5
++echo $ECHO_N "checking for __progname... $ECHO_C" >&6
++if test "${ac_cv_var___progname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_ERR_H
++#include <err.h>
++#endif
++	void * foo() { return &__progname; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var___progname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var___progname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var___progname" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int __progname;
++int foo() { return __progname; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var___progname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var___progname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var___progname`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE___PROGNAME 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if __progname is properly declared" >&5
++echo $ECHO_N "checking if __progname is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var___progname_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef HAVE_ERR_H
++#include <err.h>
++#endif
++extern struct { int foo; } __progname;
++int
++main ()
++{
++__progname.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var___progname_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var___progname_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var___progname_declaration" >&5
++echo "${ECHO_T}$ac_cv_var___progname_declaration" >&6
++if eval "test \"\$ac_cv_var___progname_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE___PROGNAME_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking if optarg is properly declared" >&5
++echo $ECHO_N "checking if optarg is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_optarg_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++extern struct { int foo; } optarg;
++int
++main ()
++{
++optarg.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_optarg_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_optarg_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_optarg_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_optarg_declaration" >&6
++if eval "test \"\$ac_cv_var_optarg_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OPTARG_DECLARATION 1
++_ACEOF
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking if optind is properly declared" >&5
++echo $ECHO_N "checking if optind is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_optind_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++extern struct { int foo; } optind;
++int
++main ()
++{
++optind.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_optind_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_optind_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_optind_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_optind_declaration" >&6
++if eval "test \"\$ac_cv_var_optind_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OPTIND_DECLARATION 1
++_ACEOF
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking if opterr is properly declared" >&5
++echo $ECHO_N "checking if opterr is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_opterr_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++extern struct { int foo; } opterr;
++int
++main ()
++{
++opterr.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_opterr_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_opterr_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_opterr_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_opterr_declaration" >&6
++if eval "test \"\$ac_cv_var_opterr_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OPTERR_DECLARATION 1
++_ACEOF
++
++fi
++
++
++
++echo "$as_me:$LINENO: checking if optopt is properly declared" >&5
++echo $ECHO_N "checking if optopt is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_optopt_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++extern struct { int foo; } optopt;
++int
++main ()
++{
++optopt.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_optopt_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_optopt_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_optopt_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_optopt_declaration" >&6
++if eval "test \"\$ac_cv_var_optopt_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OPTOPT_DECLARATION 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking if environ is properly declared" >&5
++echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_environ_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++extern struct { int foo; } environ;
++int
++main ()
++{
++environ.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_environ_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_environ_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_environ_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_environ_declaration" >&6
++if eval "test \"\$ac_cv_var_environ_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ENVIRON_DECLARATION 1
++_ACEOF
++
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
++echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
++if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++int
++main ()
++{
++struct tm x; x.tm_gmtoff;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_tm_tm_gmtoff=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_tm_tm_gmtoff=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
++echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
++if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_TM_TM_GMTOFF 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for tm_zone in struct tm" >&5
++echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
++if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++int
++main ()
++{
++struct tm x; x.tm_zone;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_tm_tm_zone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_tm_tm_zone=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_tm_tm_zone" >&5
++echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
++if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_TM_TM_ZONE 1
++_ACEOF
++
++	
++fi
++
++
++
++
++
++echo "$as_me:$LINENO: checking for timezone" >&5
++echo $ECHO_N "checking for timezone... $ECHO_C" >&6
++if test "${ac_cv_var_timezone+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++	void * foo() { return &timezone; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_timezone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_timezone=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var_timezone" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int timezone;
++int foo() { return timezone; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_timezone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_timezone=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var_timezone`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_TIMEZONE 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if timezone is properly declared" >&5
++echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_timezone_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++extern struct { int foo; } timezone;
++int
++main ()
++{
++timezone.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_timezone_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_timezone_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_timezone_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
++if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_TIMEZONE_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++echo "$as_me:$LINENO: checking for altzone" >&5
++echo $ECHO_N "checking for altzone... $ECHO_C" >&6
++if test "${ac_cv_var_altzone+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++	void * foo() { return &altzone; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_altzone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_altzone=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test "$ac_cv_var_altzone" != yes ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern int altzone;
++int foo() { return altzone; }
++int
++main ()
++{
++foo()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_var_altzone=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_var_altzone=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++fi
++
++ac_foo=`eval echo \\$ac_cv_var_altzone`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_ALTZONE 1
++_ACEOF
++
++	
++echo "$as_me:$LINENO: checking if altzone is properly declared" >&5
++echo $ECHO_N "checking if altzone is properly declared... $ECHO_C" >&6
++if test "${ac_cv_var_altzone_declaration+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++extern struct { int foo; } altzone;
++int
++main ()
++{
++altzone.foo = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_var_altzone_declaration=no"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_var_altzone_declaration=yes"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: result: $ac_cv_var_altzone_declaration" >&5
++echo "${ECHO_T}$ac_cv_var_altzone_declaration" >&6
++if eval "test \"\$ac_cv_var_altzone_declaration\" = yes"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_ALTZONE_DECLARATION 1
++_ACEOF
++
++fi
++
++
++fi
++
++
++
++
++cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for sa_family_t" >&5
++echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <sys/socket.h>
++int
++main ()
++{
++sa_family_t foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for sa_family_t" >&5
++echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
++if test "${ac_cv_type_sa_family_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((sa_family_t *) 0)
++  return 0;
++if (sizeof (sa_family_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_sa_family_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_sa_family_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_sa_family_t" >&5
++echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
++if test $ac_cv_type_sa_family_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SA_FAMILY_T 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <sys/socket.h>
++int
++main ()
++{
++socklen_t foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for socklen_t" >&5
++echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
++if test "${ac_cv_type_socklen_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((socklen_t *) 0)
++  return 0;
++if (sizeof (socklen_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_socklen_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_socklen_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
++echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
++if test $ac_cv_type_socklen_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_SOCKLEN_T 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for struct sockaddr" >&5
++echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for struct sockaddr" >&5
++echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
++if test "${ac_cv_type_struct_sockaddr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((struct sockaddr *) 0)
++  return 0;
++if (sizeof (struct sockaddr))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_sockaddr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_sockaddr=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr" >&5
++echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
++if test $ac_cv_type_struct_sockaddr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_SOCKADDR 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
++echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <sys/socket.h>
++int
++main ()
++{
++struct sockaddr_storage foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5
++echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
++if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((struct sockaddr_storage *) 0)
++  return 0;
++if (sizeof (struct sockaddr_storage))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_sockaddr_storage=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_sockaddr_storage=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
++if test $ac_cv_type_struct_sockaddr_storage = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_SOCKADDR_STORAGE 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for struct addrinfo" >&5
++echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <netdb.h>
++int
++main ()
++{
++struct addrinfo foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for struct addrinfo" >&5
++echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
++if test "${ac_cv_type_struct_addrinfo+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((struct addrinfo *) 0)
++  return 0;
++if (sizeof (struct addrinfo))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_addrinfo=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_addrinfo=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_addrinfo" >&5
++echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
++if test $ac_cv_type_struct_addrinfo = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_ADDRINFO 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "struct ifaddrs" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for struct ifaddrs" >&5
++echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <ifaddrs.h>
++int
++main ()
++{
++struct ifaddrs foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct ifaddrs | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for struct ifaddrs" >&5
++echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
++if test "${ac_cv_type_struct_ifaddrs+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((struct ifaddrs *) 0)
++  return 0;
++if (sizeof (struct ifaddrs))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_ifaddrs=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_ifaddrs=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_ifaddrs" >&5
++echo "${ECHO_T}$ac_cv_type_struct_ifaddrs" >&6
++if test $ac_cv_type_struct_ifaddrs = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_IFADDRS 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "struct iovec" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for struct iovec" >&5
++echo $ECHO_N "checking for struct iovec... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++
++#include <sys/types.h>
++#include <sys/uio.h>
++
++int
++main ()
++{
++struct iovec foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct iovec | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for struct iovec" >&5
++echo $ECHO_N "checking for struct iovec... $ECHO_C" >&6
++if test "${ac_cv_type_struct_iovec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((struct iovec *) 0)
++  return 0;
++if (sizeof (struct iovec))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_iovec=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_iovec=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_iovec" >&5
++echo "${ECHO_T}$ac_cv_type_struct_iovec" >&6
++if test $ac_cv_type_struct_iovec = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_IOVEC 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++cv=`echo "struct msghdr" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for struct msghdr" >&5
++echo $ECHO_N "checking for struct msghdr... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++
++#include <sys/types.h>
++#include <sys/socket.h>
++
++int
++main ()
++{
++struct msghdr foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo struct msghdr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for struct msghdr" >&5
++echo $ECHO_N "checking for struct msghdr... $ECHO_C" >&6
++if test "${ac_cv_type_struct_msghdr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((struct msghdr *) 0)
++  return 0;
++if (sizeof (struct msghdr))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_msghdr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_msghdr=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_msghdr" >&5
++echo "${ECHO_T}$ac_cv_type_struct_msghdr" >&6
++if test $ac_cv_type_struct_msghdr = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_STRUCT_MSGHDR 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for struct winsize" >&5
++echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
++if test "${ac_cv_struct_winsize+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++ac_cv_struct_winsize=no
++for i in sys/termios.h sys/ioctl.h; do
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$i>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "struct[ 	]*winsize" >/dev/null 2>&1; then
++  ac_cv_struct_winsize=yes; break
++fi
++rm -f conftest*
++done
++
++fi
++
++if test "$ac_cv_struct_winsize" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_WINSIZE 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_struct_winsize" >&5
++echo "${ECHO_T}$ac_cv_struct_winsize" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <termios.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "ws_xpixel" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_WS_XPIXEL 1
++_ACEOF
++
++fi
++rm -f conftest*
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <termios.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "ws_ypixel" >/dev/null 2>&1; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_WS_YPIXEL 1
++_ACEOF
++
++fi
++rm -f conftest*
++
++
++
++
++
++echo "$as_me:$LINENO: checking for struct spwd" >&5
++echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
++if test "${ac_cv_struct_spwd+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <pwd.h>
++#ifdef HAVE_SHADOW_H
++#include <shadow.h>
++#endif
++int
++main ()
++{
++struct spwd foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_struct_spwd=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_struct_spwd=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++
++echo "$as_me:$LINENO: result: $ac_cv_struct_spwd" >&5
++echo "${ECHO_T}$ac_cv_struct_spwd" >&6
++
++if test "$ac_cv_struct_spwd" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_SPWD 1
++_ACEOF
++
++fi
++
++
++
++
++
++#fi
++LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken"
++
++
++# Check whether --enable-otp or --disable-otp was given.
++if test "${enable_otp+set}" = set; then
++  enableval="$enable_otp"
++  
++fi; 
++if test "$enable_otp" = yes -a "$db_type" = unknown; then
++	{ { echo "$as_me:$LINENO: error: OTP requires a NDBM/DB compatible library" >&5
++echo "$as_me: error: OTP requires a NDBM/DB compatible library" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test "$enable_otp" != no; then
++	if test "$db_type" != unknown; then
++		enable_otp=yes
++	else
++		enable_otp=no
++	fi
++fi
++if test "$enable_otp" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define OTP 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: checking whether to enable OTP library" >&5
++echo $ECHO_N "checking whether to enable OTP library... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $enable_otp" >&5
++echo "${ECHO_T}$enable_otp" >&6
++
++
++if test "$enable_otp" = yes; then
++  OTP_TRUE=
++  OTP_FALSE='#'
++else
++  OTP_TRUE='#'
++  OTP_FALSE=
++fi
++
++
++
++# Check whether --enable-osfc2 or --disable-osfc2 was given.
++if test "${enable_osfc2+set}" = set; then
++  enableval="$enable_osfc2"
++  
++fi; 
++LIB_security=
++if test "$enable_osfc2" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_OSFC2 1
++_ACEOF
++
++	LIB_security=-lsecurity
++fi
++
++
++
++# Check whether --enable-mmap or --disable-mmap was given.
++if test "${enable_mmap+set}" = set; then
++  enableval="$enable_mmap"
++  
++fi; 
++if test "$enable_mmap" = "no"; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define NO_MMAP 1
++_ACEOF
++
++fi
++
++# Extract the first word of "nroff", so it can be a program name with args.
++set dummy nroff; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_NROFF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $NROFF in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++NROFF=$ac_cv_path_NROFF
++
++if test -n "$NROFF"; then
++  echo "$as_me:$LINENO: result: $NROFF" >&5
++echo "${ECHO_T}$NROFF" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++# Extract the first word of "groff", so it can be a program name with args.
++set dummy groff; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_GROFF+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $GROFF in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_GROFF="$GROFF" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_GROFF="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++GROFF=$ac_cv_path_GROFF
++
++if test -n "$GROFF"; then
++  echo "$as_me:$LINENO: result: $GROFF" >&5
++echo "${ECHO_T}$GROFF" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++echo "$as_me:$LINENO: checking how to format man pages" >&5
++echo $ECHO_N "checking how to format man pages... $ECHO_C" >&6
++if test "${ac_cv_sys_man_format+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat > conftest.1 << END
++.Dd January 1, 1970
++.Dt CONFTEST 1
++.Sh NAME
++.Nm conftest
++.Nd
++foobar
++END
++
++if test "$NROFF" ; then
++	for i in "-mdoc" "-mandoc"; do
++		if "$NROFF" $i conftest.1 2> /dev/null | \
++			grep Jan > /dev/null 2>&1 ; then
++			ac_cv_sys_man_format="$NROFF $i"
++			break
++		fi
++	done
++fi
++if test "$ac_cv_sys_man_format" = "" -a "$GROFF" ; then
++	for i in "-mdoc" "-mandoc"; do
++		if "$GROFF" -Tascii $i conftest.1 2> /dev/null | \
++			grep Jan > /dev/null 2>&1 ; then
++			ac_cv_sys_man_format="$GROFF -Tascii $i"
++			break
++		fi
++	done
++fi
++if test "$ac_cv_sys_man_format"; then
++	ac_cv_sys_man_format="$ac_cv_sys_man_format \$< > \$@"
++fi
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sys_man_format" >&5
++echo "${ECHO_T}$ac_cv_sys_man_format" >&6
++if test "$ac_cv_sys_man_format"; then
++	CATMAN="$ac_cv_sys_man_format"
++	
++fi
++
++
++if test "$CATMAN"; then
++  CATMAN_TRUE=
++  CATMAN_FALSE='#'
++else
++  CATMAN_TRUE='#'
++  CATMAN_FALSE=
++fi
++
++echo "$as_me:$LINENO: checking extension of pre-formatted manual pages" >&5
++echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
++if test "${ac_cv_sys_catman_ext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
++	ac_cv_sys_catman_ext=0
++else
++	ac_cv_sys_catman_ext=number
++fi
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sys_catman_ext" >&5
++echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
++if test "$ac_cv_sys_catman_ext" = number; then
++	CATMANEXT='$$section'
++else
++	CATMANEXT=0
++fi
++
++
++
++
++
++# Check whether --with-readline or --without-readline was given.
++if test "${with_readline+set}" = set; then
++  withval="$with_readline"
++  
++fi; 
++
++# Check whether --with-readline-lib or --without-readline-lib was given.
++if test "${with_readline_lib+set}" = set; then
++  withval="$with_readline_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-readline-lib" >&5
++echo "$as_me: error: No argument for --with-readline-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi; 
++
++# Check whether --with-readline-include or --without-readline-include was given.
++if test "${with_readline_include+set}" = set; then
++  withval="$with_readline_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-readline-include" >&5
++echo "$as_me: error: No argument for --with-readline-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi; 
++
++# Check whether --with-readline-config or --without-readline-config was given.
++if test "${with_readline_config+set}" = set; then
++  withval="$with_readline_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for readline" >&5
++echo $ECHO_N "checking for readline... $ECHO_C" >&6
++
++case "$with_readline" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_readline" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_readline_include" = ""; then
++		if test -d "$i/include/readline"; then
++			header_dirs="$header_dirs $i/include/readline"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_readline_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_readline_include"; then
++	header_dirs="$with_readline_include $header_dirs"
++fi
++if test "$with_readline_lib"; then
++	lib_dirs="$with_readline_lib $lib_dirs"
++fi
++
++if test "$with_readline_config" = ""; then
++	with_readline_config=''
++fi
++
++readline_cflags=
++readline_libs=
++
++case "$with_readline_config" in
++yes|no|"")
++	;;
++*)
++	readline_cflags="`$with_readline_config --cflags 2>&1`"
++	readline_libs="`$with_readline_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_readline" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$readline_cflags" -a "$readline_libs"; then
++		CFLAGS="$readline_cflags $save_CFLAGS"
++		LIBS="$readline_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_readline="$readline_cflags"
++			LIB_readline="$readline_libs"
++			echo "$as_me:$LINENO: result: from $with_readline_config" >&5
++echo "${ECHO_T}from $with_readline_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lreadline  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
++			DIR_readline=
++			INCLUDE_readline="-I$ires"
++			LIB_readline="-L$lres -lreadline "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define READLINE 1
++_ACEOF
++
++	with_readline=yes
++else
++	with_readline=no
++	DIR_readline=
++	INCLUDE_readline=
++	LIB_readline=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++
++
++
++# Check whether --with-hesiod or --without-hesiod was given.
++if test "${with_hesiod+set}" = set; then
++  withval="$with_hesiod"
++  
++fi; 
++
++# Check whether --with-hesiod-lib or --without-hesiod-lib was given.
++if test "${with_hesiod_lib+set}" = set; then
++  withval="$with_hesiod_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-hesiod-lib" >&5
++echo "$as_me: error: No argument for --with-hesiod-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_hesiod" = "X"; then
++  with_hesiod=yes
++fi
++fi; 
++
++# Check whether --with-hesiod-include or --without-hesiod-include was given.
++if test "${with_hesiod_include+set}" = set; then
++  withval="$with_hesiod_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-hesiod-include" >&5
++echo "$as_me: error: No argument for --with-hesiod-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_hesiod" = "X"; then
++  with_hesiod=yes
++fi
++fi; 
++
++# Check whether --with-hesiod-config or --without-hesiod-config was given.
++if test "${with_hesiod_config+set}" = set; then
++  withval="$with_hesiod_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for hesiod" >&5
++echo $ECHO_N "checking for hesiod... $ECHO_C" >&6
++
++case "$with_hesiod" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_hesiod" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_hesiod_include" = ""; then
++		if test -d "$i/include/hesiod"; then
++			header_dirs="$header_dirs $i/include/hesiod"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_hesiod_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_hesiod_include"; then
++	header_dirs="$with_hesiod_include $header_dirs"
++fi
++if test "$with_hesiod_lib"; then
++	lib_dirs="$with_hesiod_lib $lib_dirs"
++fi
++
++if test "$with_hesiod_config" = ""; then
++	with_hesiod_config=''
++fi
++
++hesiod_cflags=
++hesiod_libs=
++
++case "$with_hesiod_config" in
++yes|no|"")
++	;;
++*)
++	hesiod_cflags="`$with_hesiod_config --cflags 2>&1`"
++	hesiod_libs="`$with_hesiod_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_hesiod" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$hesiod_cflags" -a "$hesiod_libs"; then
++		CFLAGS="$hesiod_cflags $save_CFLAGS"
++		LIBS="$hesiod_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <hesiod.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_hesiod="$hesiod_cflags"
++			LIB_hesiod="$hesiod_libs"
++			echo "$as_me:$LINENO: result: from $with_hesiod_config" >&5
++echo "${ECHO_T}from $with_hesiod_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <hesiod.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lhesiod  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <hesiod.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_hesiod" != "no"; then
++			DIR_hesiod=
++			INCLUDE_hesiod="-I$ires"
++			LIB_hesiod="-L$lres -lhesiod "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define HESIOD 1
++_ACEOF
++
++	with_hesiod=yes
++else
++	with_hesiod=no
++	DIR_hesiod=
++	INCLUDE_hesiod=
++	LIB_hesiod=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++
++
++
++# Check whether --with-sl or --without-sl was given.
++if test "${with_sl+set}" = set; then
++  withval="$with_sl"
++  
++fi; 
++
++# Check whether --with-sl-lib or --without-sl-lib was given.
++if test "${with_sl_lib+set}" = set; then
++  withval="$with_sl_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-sl-lib" >&5
++echo "$as_me: error: No argument for --with-sl-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_sl" = "X"; then
++  with_sl=yes
++fi
++fi; 
++
++# Check whether --with-sl-include or --without-sl-include was given.
++if test "${with_sl_include+set}" = set; then
++  withval="$with_sl_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-sl-include" >&5
++echo "$as_me: error: No argument for --with-sl-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_sl" = "X"; then
++  with_sl=yes
++fi
++fi; 
++
++# Check whether --with-sl-config or --without-sl-config was given.
++if test "${with_sl_config+set}" = set; then
++  withval="$with_sl_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for sl" >&5
++echo $ECHO_N "checking for sl... $ECHO_C" >&6
++
++case "$with_sl" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_sl" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_sl_include" = ""; then
++		if test -d "$i/include/sl"; then
++			header_dirs="$header_dirs $i/include/sl"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_sl_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_sl_include"; then
++	header_dirs="$with_sl_include $header_dirs"
++fi
++if test "$with_sl_lib"; then
++	lib_dirs="$with_sl_lib $lib_dirs"
++fi
++
++if test "$with_sl_config" = ""; then
++	with_sl_config=''
++fi
++
++sl_cflags=
++sl_libs=
++
++case "$with_sl_config" in
++yes|no|"")
++	;;
++*)
++	sl_cflags="`$with_sl_config --cflags 2>&1`"
++	sl_libs="`$with_sl_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_sl" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$sl_cflags" -a "$sl_libs"; then
++		CFLAGS="$sl_cflags $save_CFLAGS"
++		LIBS="$sl_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_sl="$sl_cflags"
++			LIB_sl="$sl_libs"
++			echo "$as_me:$LINENO: result: from $with_sl_config" >&5
++echo "${ECHO_T}from $with_sl_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lsl  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_sl" != "no"; then
++			DIR_sl=
++			INCLUDE_sl="-I$ires"
++			LIB_sl="-L$lres -lsl "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SL 1
++_ACEOF
++
++	with_sl=yes
++else
++	with_sl=no
++	DIR_sl=
++	INCLUDE_sl=
++	LIB_sl=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++if ! test "$with_sl" = yes; then
++	DIR_sl="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++fi
++
++
++# Check whether --with-ss or --without-ss was given.
++if test "${with_ss+set}" = set; then
++  withval="$with_ss"
++  
++fi; 
++
++# Check whether --with-ss-lib or --without-ss-lib was given.
++if test "${with_ss_lib+set}" = set; then
++  withval="$with_ss_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-ss-lib" >&5
++echo "$as_me: error: No argument for --with-ss-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
++fi
++fi; 
++
++# Check whether --with-ss-include or --without-ss-include was given.
++if test "${with_ss_include+set}" = set; then
++  withval="$with_ss_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-ss-include" >&5
++echo "$as_me: error: No argument for --with-ss-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
++fi
++fi; 
++
++# Check whether --with-ss-config or --without-ss-config was given.
++if test "${with_ss_config+set}" = set; then
++  withval="$with_ss_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for ss" >&5
++echo $ECHO_N "checking for ss... $ECHO_C" >&6
++
++case "$with_ss" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_ss" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_ss_include" = ""; then
++		if test -d "$i/include/ss"; then
++			header_dirs="$header_dirs $i/include/ss"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_ss_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_ss_include"; then
++	header_dirs="$with_ss_include $header_dirs"
++fi
++if test "$with_ss_lib"; then
++	lib_dirs="$with_ss_lib $lib_dirs"
++fi
++
++if test "$with_ss_config" = ""; then
++	with_ss_config=''
++fi
++
++ss_cflags=
++ss_libs=
++
++case "$with_ss_config" in
++yes|no|"")
++	;;
++*)
++	ss_cflags="`$with_ss_config --cflags 2>&1`"
++	ss_libs="`$with_ss_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_ss" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$ss_cflags" -a "$ss_libs"; then
++		CFLAGS="$ss_cflags $save_CFLAGS"
++		LIBS="$ss_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_ss="$ss_cflags"
++			LIB_ss="$ss_libs"
++			echo "$as_me:$LINENO: result: from $with_ss_config" >&5
++echo "${ECHO_T}from $with_ss_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lss  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_ss" != "no"; then
++			DIR_ss=
++			INCLUDE_ss="-I$ires"
++			LIB_ss="-L$lres -lss "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SS 1
++_ACEOF
++
++	with_ss=yes
++else
++	with_ss=no
++	DIR_ss=
++	INCLUDE_ss=
++	LIB_ss=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++if ! test "$with_sl" = yes; then
++	DIR_sl="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	DIR_ss=""
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++fi
++if test "$enable_otp" = "yes"; then
++  
++
++# Check whether --with-otp or --without-otp was given.
++if test "${with_otp+set}" = set; then
++  withval="$with_otp"
++  
++fi; 
++
++# Check whether --with-otp-lib or --without-otp-lib was given.
++if test "${with_otp_lib+set}" = set; then
++  withval="$with_otp_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-otp-lib" >&5
++echo "$as_me: error: No argument for --with-otp-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_otp" = "X"; then
++  with_otp=yes
++fi
++fi; 
++
++# Check whether --with-otp-include or --without-otp-include was given.
++if test "${with_otp_include+set}" = set; then
++  withval="$with_otp_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-otp-include" >&5
++echo "$as_me: error: No argument for --with-otp-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_otp" = "X"; then
++  with_otp=yes
++fi
++fi; 
++
++# Check whether --with-otp-config or --without-otp-config was given.
++if test "${with_otp_config+set}" = set; then
++  withval="$with_otp_config"
++  
++fi; 
++
++
++
++echo "$as_me:$LINENO: checking for otp" >&5
++echo $ECHO_N "checking for otp... $ECHO_C" >&6
++
++case "$with_otp" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_otp" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_otp_include" = ""; then
++		if test -d "$i/include/otp"; then
++			header_dirs="$header_dirs $i/include/otp"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_otp_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_otp_include"; then
++	header_dirs="$with_otp_include $header_dirs"
++fi
++if test "$with_otp_lib"; then
++	lib_dirs="$with_otp_lib $lib_dirs"
++fi
++
++if test "$with_otp_config" = ""; then
++	with_otp_config=''
++fi
++
++otp_cflags=
++otp_libs=
++
++case "$with_otp_config" in
++yes|no|"")
++	;;
++*)
++	otp_cflags="`$with_otp_config --cflags 2>&1`"
++	otp_libs="`$with_otp_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_otp" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$otp_cflags" -a "$otp_libs"; then
++		CFLAGS="$otp_cflags $save_CFLAGS"
++		LIBS="$otp_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++			INCLUDE_otp="$otp_cflags"
++			LIB_otp="$otp_libs"
++			echo "$as_me:$LINENO: result: from $with_otp_config" >&5
++echo "${ECHO_T}from $with_otp_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lotp  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_otp" != "no"; then
++			DIR_otp=
++			INCLUDE_otp="-I$ires"
++			LIB_otp="-L$lres -lotp "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define OTP 1
++_ACEOF
++
++	with_otp=yes
++else
++	with_otp=no
++	DIR_otp=
++	INCLUDE_otp=
++	LIB_otp=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++  if ! test "$with_otp" = yes; then
++	DIR_otp="otp"
++ 	LIB_otp='$(top_builddir)/lib/otp/libotp.la'
++  fi
++fi
++
++
++# Check whether --enable-bigendian or --disable-bigendian was given.
++if test "${enable_bigendian+set}" = set; then
++  enableval="$enable_bigendian"
++  krb_cv_c_bigendian=yes
++fi; 
++# Check whether --enable-littleendian or --disable-littleendian was given.
++if test "${enable_littleendian+set}" = set; then
++  enableval="$enable_littleendian"
++  krb_cv_c_bigendian=no
++fi; 
++echo "$as_me:$LINENO: checking whether byte order is known at compile time" >&5
++echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
++if test "${krb_cv_c_bigendian_compile+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/param.h>
++int
++main ()
++{
++
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_c_bigendian_compile=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++krb_cv_c_bigendian_compile=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $krb_cv_c_bigendian_compile" >&5
++echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
++echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++if test "${krb_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++  if test "$krb_cv_c_bigendian_compile" = "yes"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/param.h>
++int
++main ()
++{
++
++#if BYTE_ORDER != BIG_ENDIAN
++  not big endian
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++krb_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  else
++    if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: specify either --enable-bigendian or --enable-littleendian" >&5
++echo "$as_me: error: specify either --enable-bigendian or --enable-littleendian" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++main () {
++      /* Are we little or big endian?  From Harbison&Steele.  */
++      union
++      {
++	long l;
++	char c[sizeof (long)];
++    } u;
++    u.l = 1;
++    exit (u.c[sizeof (long) - 1] == 1);
++  }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_c_bigendian=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++krb_cv_c_bigendian=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++  fi
++
++fi
++echo "$as_me:$LINENO: result: $krb_cv_c_bigendian" >&5
++echo "${ECHO_T}$krb_cv_c_bigendian" >&6
++if test "$krb_cv_c_bigendian" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define WORDS_BIGENDIAN 1
++_ACEOF
++fi
++if test "$krb_cv_c_bigendian_compile" = "yes"; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENDIANESS_IN_SYS_PARAM_H 1
++_ACEOF
++fi
++
++
++
++echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6
++if test "${ac_cv_c_inline+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_inline=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++    ;;
++esac
++
++
++
++	
++
++
++echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_funclib_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_dlopen\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" dl; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++dlopen()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_dlopen=$ac_lib; else ac_cv_funclib_dlopen=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_dlopen=\${ac_cv_funclib_dlopen-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_dlopen"
++
++if false; then
++	
++for ac_func in dlopen
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# dlopen
++eval "ac_tr_func=HAVE_`echo dlopen | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_dlopen=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_dlopen=yes"
++	eval "LIB_dlopen="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_dlopen=no"
++	eval "LIB_dlopen="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_dlopen=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++	
++
++if test "$ac_cv_funclib_dlopen" != no; then
++  HAVE_DLOPEN_TRUE=
++  HAVE_DLOPEN_FALSE='#'
++else
++  HAVE_DLOPEN_TRUE='#'
++  HAVE_DLOPEN_FALSE=
++fi
++
++
++
++
++aix=no
++case "$host" in 
++*-*-aix3*)
++	aix=3
++	;;
++*-*-aix4*|*-*-aix5*)
++	aix=4
++	;;
++esac
++
++
++
++if test "$aix" != no; then
++  AIX_TRUE=
++  AIX_FALSE='#'
++else
++  AIX_TRUE='#'
++  AIX_FALSE=
++fi
++
++
++if test "$aix" = 4; then
++  AIX4_TRUE=
++  AIX4_FALSE='#'
++else
++  AIX4_TRUE='#'
++  AIX4_FALSE=
++fi
++
++
++
++# Check whether --enable-dynamic-afs or --disable-dynamic-afs was given.
++if test "${enable_dynamic_afs+set}" = set; then
++  enableval="$enable_dynamic_afs"
++  
++fi; 
++
++if test "$aix" != no; then
++	if test "$enable_dynamic_afs" != no; then
++		
++		if test "$ac_cv_func_dlopen" = no; then
++			
++
++
++echo "$as_me:$LINENO: checking for loadquery" >&5
++echo $ECHO_N "checking for loadquery... $ECHO_C" >&6
++if test "${ac_cv_funclib_loadquery+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_loadquery\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" ld; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++loadquery()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_loadquery=$ac_lib; else ac_cv_funclib_loadquery=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_loadquery=\${ac_cv_funclib_loadquery-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_loadquery"
++
++if false; then
++	
++for ac_func in loadquery
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# loadquery
++eval "ac_tr_func=HAVE_`echo loadquery | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_loadquery=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_loadquery=yes"
++	eval "LIB_loadquery="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_loadquery=no"
++	eval "LIB_loadquery="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_loadquery=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++		fi
++		if test "$ac_cv_func_dlopen" != no; then
++			AIX_EXTRA_KAFS='$(LIB_dlopen)'
++		elif test "$ac_cv_func_loadquery" != no; then
++			AIX_EXTRA_KAFS='$(LIB_loadquery)'
++		else
++			{ echo "$as_me:$LINENO: not using dynloaded AFS library" >&5
++echo "$as_me: not using dynloaded AFS library" >&6;}
++			AIX_EXTRA_KAFS=
++			enable_dynamic_afs=no
++		fi
++	else
++		AIX_EXTRA_KAFS=
++	fi
++fi
++
++
++
++if test "$enable_dynamic_afs" != no; then
++  AIX_DYNAMIC_AFS_TRUE=
++  AIX_DYNAMIC_AFS_FALSE='#'
++else
++  AIX_DYNAMIC_AFS_TRUE='#'
++  AIX_DYNAMIC_AFS_FALSE=
++fi
++
++
++
++
++
++
++irix=no
++case "$host" in
++*-*-irix4*) 
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define IRIX4 1
++_ACEOF
++
++	irix=yes
++	;;
++*-*-irix*) 
++	irix=yes
++	;;
++esac
++
++
++if test "$irix" != no; then
++  IRIX_TRUE=
++  IRIX_FALSE='#'
++else
++  IRIX_TRUE='#'
++  IRIX_FALSE=
++fi
++
++
++
++
++
++sunos=no
++case "$host" in 
++*-*-sunos4*)
++	sunos=40
++	;;
++*-*-solaris2.7)
++	sunos=57
++	;;
++*-*-solaris2.[89])
++	sunos=58
++	;;
++*-*-solaris2*)
++	sunos=50
++	;;
++esac
++if test "$sunos" != no; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SunOS $sunos
++_ACEOF
++
++fi
++
++
++
++
++if test "x$ac_path_x_has_been_run" != xyes; then
++  echo "$as_me:$LINENO: checking for X" >&5
++echo $ECHO_N "checking for X... $ECHO_C" >&6
++
++ac_path_x_has_been_run=yes
++
++# Check whether --with-x or --without-x was given.
++if test "${with_x+set}" = set; then
++  withval="$with_x"
++  
++fi; 
++# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
++if test "x$with_x" = xno; then
++  # The user explicitly disabled X.
++  have_x=disabled
++else
++  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
++    # Both variables are already set.
++    have_x=yes
++  else
++    if test "${ac_cv_have_x+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # One or both of the vars are not set, and there is no cached value.
++ac_x_includes=no ac_x_libraries=no
++rm -fr conftest.dir
++if mkdir conftest.dir; then
++  cd conftest.dir
++  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
++  cat >Imakefile <<'_ACEOF'
++acfindx:
++	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++_ACEOF
++  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
++    for ac_extension in a so sl; do
++      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
++	 test -f $ac_im_libdir/libX11.$ac_extension; then
++	ac_im_usrlibdir=$ac_im_libdir; break
++      fi
++    done
++    # Screen out bogus values from the imake configuration.  They are
++    # bogus both because they are the default anyway, and because
++    # using them would break gcc on systems where it needs fixed includes.
++    case $ac_im_incroot in
++	/usr/include) ;;
++	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
++    esac
++    case $ac_im_usrlibdir in
++	/usr/lib | /lib) ;;
++	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
++    esac
++  fi
++  cd ..
++  rm -fr conftest.dir
++fi
++
++# Standard set of common directories for X headers.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++ac_x_header_dirs='
++/usr/X11/include
++/usr/X11R6/include
++/usr/X11R5/include
++/usr/X11R4/include
++
++/usr/include/X11
++/usr/include/X11R6
++/usr/include/X11R5
++/usr/include/X11R4
++
++/usr/local/X11/include
++/usr/local/X11R6/include
++/usr/local/X11R5/include
++/usr/local/X11R4/include
++
++/usr/local/include/X11
++/usr/local/include/X11R6
++/usr/local/include/X11R5
++/usr/local/include/X11R4
++
++/usr/X386/include
++/usr/x386/include
++/usr/XFree86/include/X11
++
++/usr/include
++/usr/local/include
++/usr/unsupported/include
++/usr/athena/include
++/usr/local/x11r5/include
++/usr/lpp/Xamples/include
++
++/usr/openwin/include
++/usr/openwin/share/include'
++
++if test "$ac_x_includes" = no; then
++  # Guess where to find include files, by looking for a specified header file.
++  # First, try using that file with no special directory specified.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <X11/Intrinsic.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # We can compile using X headers with no special include directory.
++ac_x_includes=
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  for ac_dir in $ac_x_header_dirs; do
++  if test -r "$ac_dir/X11/Intrinsic.h"; then
++    ac_x_includes=$ac_dir
++    break
++  fi
++done
++fi
++rm -f conftest.err conftest.$ac_ext
++fi # $ac_x_includes = no
++
++if test "$ac_x_libraries" = no; then
++  # Check for the libraries.
++  # See if we find them without any special options.
++  # Don't add to $LIBS permanently.
++  ac_save_LIBS=$LIBS
++  LIBS="-lXt $LIBS"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <X11/Intrinsic.h>
++int
++main ()
++{
++XtMalloc (0)
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  LIBS=$ac_save_LIBS
++# We can link X programs with no special library path.
++ac_x_libraries=
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++LIBS=$ac_save_LIBS
++for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
++do
++  # Don't even attempt the hair of trying to link an X program!
++  for ac_extension in a so sl; do
++    if test -r $ac_dir/libXt.$ac_extension; then
++      ac_x_libraries=$ac_dir
++      break 2
++    fi
++  done
++done
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi # $ac_x_libraries = no
++
++if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
++  # Didn't find X anywhere.  Cache the known absence of X.
++  ac_cv_have_x="have_x=no"
++else
++  # Record where we found X for the cache.
++  ac_cv_have_x="have_x=yes \
++		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
++fi
++fi
++
++  fi
++  eval "$ac_cv_have_x"
++fi # $with_x != no
++
++if test "$have_x" != yes; then
++  echo "$as_me:$LINENO: result: $have_x" >&5
++echo "${ECHO_T}$have_x" >&6
++  no_x=yes
++else
++  # If each of the values was on the command line, it overrides each guess.
++  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
++  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
++  # Update the cache value to reflect the command line values.
++  ac_cv_have_x="have_x=yes \
++		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
++  # It might be that x_includes is empty (headers are found in the
++  # standard search path. Then output the corresponding message
++  ac_out_x_includes=$x_includes
++  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
++  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
++echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
++fi
++
++fi
++if test "$no_x" = yes; then
++  # Not all programs may use this symbol, but it does not hurt to define it.
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define X_DISPLAY_MISSING 1
++_ACEOF
++
++  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
++else
++  if test -n "$x_includes"; then
++    X_CFLAGS="$X_CFLAGS -I$x_includes"
++  fi
++
++  # It would also be nice to do this for all -L options, not just this one.
++  if test -n "$x_libraries"; then
++    X_LIBS="$X_LIBS -L$x_libraries"
++    # For Solaris; some versions of Sun CC require a space after -R and
++    # others require no space.  Words are not sufficient . . . .
++    case `(uname -sr) 2>/dev/null` in
++    "SunOS 5"*)
++      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
++      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_R_nospace=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_R_nospace=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++      if test $ac_R_nospace = yes; then
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	X_LIBS="$X_LIBS -R$x_libraries"
++      else
++	LIBS="$ac_xsave_LIBS -R $x_libraries"
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_R_space=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_R_space=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	if test $ac_R_space = yes; then
++	  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	  X_LIBS="$X_LIBS -R $x_libraries"
++	else
++	  echo "$as_me:$LINENO: result: neither works" >&5
++echo "${ECHO_T}neither works" >&6
++	fi
++      fi
++      LIBS=$ac_xsave_LIBS
++    esac
++  fi
++
++  # Check for system-dependent libraries X programs must link with.
++  # Do this before checking for the system-independent R6 libraries
++  # (-lICE), since we may need -lsocket or whatever for X linking.
++
++  if test "$ISC" = yes; then
++    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
++  else
++    # Martyn Johnson says this is needed for Ultrix, if the X
++    # libraries were built with DECnet support.  And Karl Berry says
++    # the Alpha needs dnet_stub (dnet does not exist).
++    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char XOpenDisplay ();
++int
++main ()
++{
++XOpenDisplay ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldnet  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dnet_ntoa ();
++int
++main ()
++{
++dnet_ntoa ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dnet_dnet_ntoa=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dnet_dnet_ntoa=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
++if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
++fi
++
++    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
++      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldnet_stub  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dnet_ntoa ();
++int
++main ()
++{
++dnet_ntoa ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dnet_stub_dnet_ntoa=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dnet_stub_dnet_ntoa=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
++if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
++fi
++
++    fi
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++    LIBS="$ac_xsave_LIBS"
++
++    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
++    # to get the SysV transport functions.
++    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
++    # needs -lnsl.
++    # The nsl library prevents programs from opening the X display
++    # on Irix 5.2, according to T.E. Dickey.
++    # The functions gethostbyname, getservbyname, and inet_addr are
++    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
++    echo "$as_me:$LINENO: checking for gethostbyname" >&5
++echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
++if test "${ac_cv_func_gethostbyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define gethostbyname innocuous_gethostbyname
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gethostbyname (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef gethostbyname
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gethostbyname ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
++choke me
++#else
++char (*f) () = gethostbyname;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != gethostbyname;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_gethostbyname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
++
++    if test $ac_cv_func_gethostbyname = no; then
++      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gethostbyname ();
++int
++main ()
++{
++gethostbyname ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_nsl_gethostbyname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_nsl_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
++if test $ac_cv_lib_nsl_gethostbyname = yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
++fi
++
++      if test $ac_cv_lib_nsl_gethostbyname = no; then
++	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lbsd  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char gethostbyname ();
++int
++main ()
++{
++gethostbyname ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_bsd_gethostbyname=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_bsd_gethostbyname=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
++if test $ac_cv_lib_bsd_gethostbyname = yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
++fi
++
++      fi
++    fi
++
++    # lieder@skyler.mavd.honeywell.com says without -lsocket,
++    # socket/setsockopt and other routines are undefined under SCO ODT
++    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
++    # on later versions), says Simon Leinen: it contains gethostby*
++    # variants that don't use the name server (or something).  -lsocket
++    # must be given before -lnsl if both are needed.  We assume that
++    # if connect needs -lnsl, so does gethostbyname.
++    echo "$as_me:$LINENO: checking for connect" >&5
++echo $ECHO_N "checking for connect... $ECHO_C" >&6
++if test "${ac_cv_func_connect+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define connect to an innocuous variant, in case <limits.h> declares connect.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define connect innocuous_connect
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char connect (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef connect
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char connect ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_connect) || defined (__stub___connect)
++choke me
++#else
++char (*f) () = connect;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != connect;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_connect=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_connect=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
++echo "${ECHO_T}$ac_cv_func_connect" >&6
++
++    if test $ac_cv_func_connect = no; then
++      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
++if test "${ac_cv_lib_socket_connect+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char connect ();
++int
++main ()
++{
++connect ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_socket_connect=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_socket_connect=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
++if test $ac_cv_lib_socket_connect = yes; then
++  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++fi
++
++    fi
++
++    # Guillermo Gomez says -lposix is necessary on A/UX.
++    echo "$as_me:$LINENO: checking for remove" >&5
++echo $ECHO_N "checking for remove... $ECHO_C" >&6
++if test "${ac_cv_func_remove+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define remove to an innocuous variant, in case <limits.h> declares remove.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define remove innocuous_remove
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char remove (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef remove
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char remove ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_remove) || defined (__stub___remove)
++choke me
++#else
++char (*f) () = remove;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != remove;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_remove=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_remove=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
++echo "${ECHO_T}$ac_cv_func_remove" >&6
++
++    if test $ac_cv_func_remove = no; then
++      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
++if test "${ac_cv_lib_posix_remove+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lposix  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char remove ();
++int
++main ()
++{
++remove ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_posix_remove=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_posix_remove=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
++if test $ac_cv_lib_posix_remove = yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
++fi
++
++    fi
++
++    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++    echo "$as_me:$LINENO: checking for shmat" >&5
++echo $ECHO_N "checking for shmat... $ECHO_C" >&6
++if test "${ac_cv_func_shmat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shmat innocuous_shmat
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shmat (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shmat
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shmat ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shmat) || defined (__stub___shmat)
++choke me
++#else
++char (*f) () = shmat;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shmat;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shmat=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shmat=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
++echo "${ECHO_T}$ac_cv_func_shmat" >&6
++
++    if test $ac_cv_func_shmat = no; then
++      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lipc  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shmat ();
++int
++main ()
++{
++shmat ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ipc_shmat=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ipc_shmat=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
++if test $ac_cv_lib_ipc_shmat = yes; then
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
++fi
++
++    fi
++  fi
++
++  # Check for libraries that X11R6 Xt/Xaw programs need.
++  ac_save_LDFLAGS=$LDFLAGS
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
++  # check for ICE first), but we must link in the order -lSM -lICE or
++  # we get undefined symbols.  So assume we have SM if we have ICE.
++  # These have to be linked with before -lX11, unlike the other
++  # libraries we check for below, so use a different variable.
++  # John Interrante, Karl Berry
++  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lICE $X_EXTRA_LIBS $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char IceConnectionNumber ();
++int
++main ()
++{
++IceConnectionNumber ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ICE_IceConnectionNumber=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ICE_IceConnectionNumber=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
++if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
++  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
++fi
++
++  LDFLAGS=$ac_save_LDFLAGS
++
++fi
++
++
++# try to figure out if we need any additional ld flags, like -R
++# and yes, the autoconf X test is utterly broken
++if test "$no_x" != yes; then
++	echo "$as_me:$LINENO: checking for special X linker flags" >&5
++echo $ECHO_N "checking for special X linker flags... $ECHO_C" >&6
++if test "${krb_cv_sys_x_libs_rpath+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++	ac_save_libs="$LIBS"
++	ac_save_cflags="$CFLAGS"
++	CFLAGS="$CFLAGS $X_CFLAGS"
++	krb_cv_sys_x_libs_rpath=""
++	krb_cv_sys_x_libs=""
++	for rflag in "" "-R" "-R " "-rpath "; do
++		if test "$rflag" = ""; then
++			foo="$X_LIBS"
++		else
++			foo=""
++			for flag in $X_LIBS; do
++			case $flag in
++			-L*)
++				foo="$foo $flag `echo $flag | sed \"s/-L/$rflag/\"`"
++				;;
++			*)
++				foo="$foo $flag"
++				;;
++			esac
++			done
++		fi
++		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++		if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++		#include <X11/Xlib.h>
++		foo()
++		{
++		XOpenDisplay(NULL);
++		}
++		main()
++		{
++		return 0;
++		}
++		
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++:
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++	done
++	LIBS="$ac_save_libs"
++	CFLAGS="$ac_save_cflags"
++	
++fi
++echo "$as_me:$LINENO: result: $krb_cv_sys_x_libs_rpath" >&5
++echo "${ECHO_T}$krb_cv_sys_x_libs_rpath" >&6
++	X_LIBS="$krb_cv_sys_x_libs"
++fi
++
++
++
++
++if test "$no_x" != yes; then
++  HAVE_X_TRUE=
++  HAVE_X_FALSE='#'
++else
++  HAVE_X_TRUE='#'
++  HAVE_X_FALSE=
++fi
++
++
++
++save_CFLAGS="$CFLAGS"
++CFLAGS="$X_CFLAGS $CFLAGS"
++save_LIBS="$LIBS"
++LIBS="$X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
++save_LDFLAGS="$LDFLAGS"
++LDFLAGS="$LDFLAGS $X_LIBS"
++
++
++
++
++
++echo "$as_me:$LINENO: checking for XauWriteAuth" >&5
++echo $ECHO_N "checking for XauWriteAuth... $ECHO_C" >&6
++if test "${ac_cv_funclib_XauWriteAuth+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_XauWriteAuth\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" X11 Xau; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++XauWriteAuth()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauWriteAuth=$ac_lib; else ac_cv_funclib_XauWriteAuth=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_XauWriteAuth=\${ac_cv_funclib_XauWriteAuth-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_XauWriteAuth"
++
++if false; then
++	
++for ac_func in XauWriteAuth
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# XauWriteAuth
++eval "ac_tr_func=HAVE_`echo XauWriteAuth | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_XauWriteAuth=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_XauWriteAuth=yes"
++	eval "LIB_XauWriteAuth="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_XauWriteAuth=no"
++	eval "LIB_XauWriteAuth="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_XauWriteAuth=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++ac_xxx="$LIBS"
++LIBS="$LIB_XauWriteAuth $LIBS"
++
++
++
++echo "$as_me:$LINENO: checking for XauReadAuth" >&5
++echo $ECHO_N "checking for XauReadAuth... $ECHO_C" >&6
++if test "${ac_cv_funclib_XauReadAuth+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_XauReadAuth\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" X11 Xau; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++XauReadAuth()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauReadAuth=$ac_lib; else ac_cv_funclib_XauReadAuth=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_XauReadAuth=\${ac_cv_funclib_XauReadAuth-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_XauReadAuth"
++
++if false; then
++	
++for ac_func in XauReadAuth
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# XauReadAuth
++eval "ac_tr_func=HAVE_`echo XauReadAuth | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_XauReadAuth=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_XauReadAuth=yes"
++	eval "LIB_XauReadAuth="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_XauReadAuth=no"
++	eval "LIB_XauReadAuth="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_XauReadAuth=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++LIBS="$LIB_XauReadAauth $LIBS"
++
++
++
++echo "$as_me:$LINENO: checking for XauFileName" >&5
++echo $ECHO_N "checking for XauFileName... $ECHO_C" >&6
++if test "${ac_cv_funclib_XauFileName+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_XauFileName\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" X11 Xau; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++XauFileName()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauFileName=$ac_lib; else ac_cv_funclib_XauFileName=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_XauFileName=\${ac_cv_funclib_XauFileName-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_XauFileName"
++
++if false; then
++	
++for ac_func in XauFileName
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# XauFileName
++eval "ac_tr_func=HAVE_`echo XauFileName | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_XauFileName=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_XauFileName=yes"
++	eval "LIB_XauFileName="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_XauFileName=no"
++	eval "LIB_XauFileName="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_XauFileName=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++LIBS="$ac_xxx"
++
++case "$ac_cv_funclib_XauWriteAuth" in
++yes)	;;
++no)	;;
++*)	if test "$ac_cv_funclib_XauReadAuth" = yes; then
++		if test "$ac_cv_funclib_XauFileName" = yes; then
++			LIB_XauReadAuth="$LIB_XauWriteAuth"
++		else
++			LIB_XauReadAuth="$LIB_XauWriteAuth $LIB_XauFileName"
++		fi
++	else
++		if test "$ac_cv_funclib_XauFileName" = yes; then
++			LIB_XauReadAuth="$LIB_XauReadAuth $LIB_XauWriteAuth"
++		else
++			LIB_XauReadAuth="$LIB_XauReadAuth $LIB_XauWriteAuth $LIB_XauFileName"
++		fi
++	fi
++	;;
++esac
++
++if test "$AUTOMAKE" != ""; then
++	
++
++if test "$ac_cv_func_XauWriteAuth" != "yes"; then
++  NEED_WRITEAUTH_TRUE=
++  NEED_WRITEAUTH_FALSE='#'
++else
++  NEED_WRITEAUTH_TRUE='#'
++  NEED_WRITEAUTH_FALSE=
++fi
++
++else
++	
++	
++	if test "$ac_cv_func_XauWriteAuth" != "yes"; then
++		NEED_WRITEAUTH_TRUE=
++		NEED_WRITEAUTH_FALSE='#'
++	else
++		NEED_WRITEAUTH_TRUE='#'
++		NEED_WRITEAUTH_FALSE=
++	fi
++fi
++CFLAGS=$save_CFLAGS
++LIBS=$save_LIBS
++LDFLAGS=$save_LDFLAGS
++
++
++
++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
++if test $ac_cv_c_const = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define const 
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for off_t" >&5
++echo $ECHO_N "checking for off_t... $ECHO_C" >&6
++if test "${ac_cv_type_off_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((off_t *) 0)
++  return 0;
++if (sizeof (off_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_off_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_off_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++echo "${ECHO_T}$ac_cv_type_off_t" >&6
++if test $ac_cv_type_off_t = yes; then
++  :
++else
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define off_t long
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for mode_t" >&5
++echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
++if test "${ac_cv_type_mode_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  ac_cv_type_mode_t=yes
++else
++  ac_cv_type_mode_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
++echo "${ECHO_T}$ac_cv_type_mode_t" >&6
++if test $ac_cv_type_mode_t = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define mode_t unsigned short
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for sig_atomic_t" >&5
++echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
++if test "${ac_cv_type_sig_atomic_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++#include <signal.h>
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "sig_atomic_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  ac_cv_type_sig_atomic_t=yes
++else
++  ac_cv_type_sig_atomic_t=no
++fi
++rm -f conftest*
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5
++echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
++if test $ac_cv_type_sig_atomic_t = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define sig_atomic_t int
++_ACEOF
++
++fi
++
++
++
++cv=`echo "long long" | sed 'y%./+- %__p__%'`
++echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6
++if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#if STDC_HEADERS
++#include <stdlib.h>
++#include <stddef.h>
++#endif
++
++int
++main ()
++{
++long long foo;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "ac_cv_type_$cv=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "ac_cv_type_$cv=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++ac_foo=`eval echo \\$ac_cv_type_$cv`
++echo "$as_me:$LINENO: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++  ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
++if false; then
++	echo "$as_me:$LINENO: checking for long long" >&5
++echo $ECHO_N "checking for long long... $ECHO_C" >&6
++if test "${ac_cv_type_long_long+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if ((long long *) 0)
++  return 0;
++if (sizeof (long long))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_long_long=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_long_long=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
++echo "${ECHO_T}$ac_cv_type_long_long" >&6
++if test $ac_cv_type_long_long = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_LONG_LONG 1
++_ACEOF
++
++
++fi
++
++fi
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_hdr 1
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
++if test "${ac_cv_header_time+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/time.h>
++#include <time.h>
++
++int
++main ()
++{
++if ((struct tm *) 0)
++return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_time=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_time=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
++echo "${ECHO_T}$ac_cv_header_time" >&6
++if test $ac_cv_header_time = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TIME_WITH_SYS_TIME 1
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
++echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
++if test "${ac_cv_struct_tm+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <time.h>
++
++int
++main ()
++{
++struct tm *tp; tp->tm_sec;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_struct_tm=time.h
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_struct_tm=sys/time.h
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
++echo "${ECHO_T}$ac_cv_struct_tm" >&6
++if test $ac_cv_struct_tm = sys/time.h; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define TM_IN_SYS_TIME 1
++_ACEOF
++
++fi
++
++
++echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++if test "${ac_cv_header_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_header_stdc=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++echo "${ECHO_T}$ac_cv_header_stdc" >&6
++if test $ac_cv_header_stdc = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++for ac_header in \
++	arpa/ftp.h				\
++	arpa/telnet.h				\
++	bind/bitypes.h				\
++	bsdsetjmp.h				\
++	curses.h				\
++	dlfcn.h					\
++	fnmatch.h				\
++	inttypes.h				\
++	io.h					\
++	libutil.h				\
++	limits.h				\
++	maillock.h				\
++	netgroup.h				\
++	netinet/in6_machtypes.h			\
++	netinfo/ni.h				\
++	pthread.h				\
++	pty.h					\
++	sac.h					\
++	security/pam_modules.h			\
++	sgtty.h					\
++	siad.h					\
++	signal.h				\
++	stropts.h				\
++	sys/bitypes.h				\
++	sys/category.h				\
++	sys/file.h				\
++	sys/filio.h				\
++	sys/ioccom.h				\
++	sys/mman.h				\
++	sys/pty.h				\
++	sys/ptyio.h				\
++	sys/ptyvar.h				\
++	sys/select.h				\
++	sys/str_tty.h				\
++	sys/stream.h				\
++	sys/stropts.h				\
++	sys/strtty.h				\
++	sys/syscall.h				\
++	sys/termio.h				\
++	sys/timeb.h				\
++	sys/times.h				\
++	sys/un.h				\
++	term.h					\
++	termcap.h				\
++	termio.h				\
++	time.h					\
++	tmpdir.h				\
++	udb.h					\
++	utmp.h					\
++	utmpx.h					\
++
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++# Check whether --enable-netinfo or --disable-netinfo was given.
++if test "${enable_netinfo+set}" = set; then
++  enableval="$enable_netinfo"
++  
++fi; 
++
++if test "$ac_cv_header_netinfo_ni_h" = yes -a "$enable_netinfo" = yes; then
++       
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_NETINFO 1
++_ACEOF
++
++fi
++
++
++
++
++
++echo "$as_me:$LINENO: checking for logwtmp" >&5
++echo $ECHO_N "checking for logwtmp... $ECHO_C" >&6
++if test "${ac_cv_funclib_logwtmp+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_logwtmp\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" util; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++logwtmp()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logwtmp=$ac_lib; else ac_cv_funclib_logwtmp=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_logwtmp=\${ac_cv_funclib_logwtmp-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_logwtmp"
++
++if false; then
++	
++for ac_func in logwtmp
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# logwtmp
++eval "ac_tr_func=HAVE_`echo logwtmp | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_logwtmp=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_logwtmp=yes"
++	eval "LIB_logwtmp="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_logwtmp=no"
++	eval "LIB_logwtmp="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_logwtmp=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++echo "$as_me:$LINENO: checking for logout" >&5
++echo $ECHO_N "checking for logout... $ECHO_C" >&6
++if test "${ac_cv_funclib_logout+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_logout\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" util; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++logout()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_logout=$ac_lib; else ac_cv_funclib_logout=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_logout=\${ac_cv_funclib_logout-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_logout"
++
++if false; then
++	
++for ac_func in logout
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# logout
++eval "ac_tr_func=HAVE_`echo logout | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_logout=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_logout=yes"
++	eval "LIB_logout="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_logout=no"
++	eval "LIB_logout="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_logout=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++echo "$as_me:$LINENO: checking for openpty" >&5
++echo $ECHO_N "checking for openpty... $ECHO_C" >&6
++if test "${ac_cv_funclib_openpty+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_openpty\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" util; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++openpty()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_openpty=$ac_lib; else ac_cv_funclib_openpty=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_openpty=\${ac_cv_funclib_openpty-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_openpty"
++
++if false; then
++	
++for ac_func in openpty
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# openpty
++eval "ac_tr_func=HAVE_`echo openpty | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_openpty=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_openpty=yes"
++	eval "LIB_openpty="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_openpty=no"
++	eval "LIB_openpty="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_openpty=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++echo "$as_me:$LINENO: checking for tgetent" >&5
++echo $ECHO_N "checking for tgetent... $ECHO_C" >&6
++if test "${ac_cv_funclib_tgetent+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_tgetent\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" termcap ncurses curses; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++tgetent()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_tgetent=$ac_lib; else ac_cv_funclib_tgetent=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_tgetent=\${ac_cv_funclib_tgetent-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_tgetent"
++
++if false; then
++	
++for ac_func in tgetent
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# tgetent
++eval "ac_tr_func=HAVE_`echo tgetent | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_tgetent=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_tgetent=yes"
++	eval "LIB_tgetent="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_tgetent=no"
++	eval "LIB_tgetent="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_tgetent=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++for ac_func in 				\
++	_getpty					\
++	_scrsize				\
++	fcntl					\
++	grantpt					\
++	mktime					\
++	ptsname					\
++	rand					\
++	revoke					\
++	select					\
++	setitimer				\
++	setpcred				\
++	setpgid					\
++	setproctitle				\
++	setregid				\
++	setresgid				\
++	setresuid				\
++	setreuid				\
++	setsid					\
++	setutent				\
++	sigaction				\
++	strstr					\
++	timegm					\
++	ttyname					\
++	ttyslot					\
++	umask					\
++	unlockpt				\
++	vhangup					\
++	yp_get_default_domain			\
++
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++for ac_header in stdlib.h unistd.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++for ac_func in getpagesize
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++echo "$as_me:$LINENO: checking for working mmap" >&5
++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  ac_cv_func_mmap_fixed_mapped=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++/* malloc might have been renamed as rpl_malloc. */
++#undef malloc
++
++/* Thanks to Mike Haertel and Jim Avera for this test.
++   Here is a matrix of mmap possibilities:
++	mmap private not fixed
++	mmap private fixed at somewhere currently unmapped
++	mmap private fixed at somewhere already mapped
++	mmap shared not fixed
++	mmap shared fixed at somewhere currently unmapped
++	mmap shared fixed at somewhere already mapped
++   For private mappings, we should verify that changes cannot be read()
++   back from the file, nor mmap's back from the file at a different
++   address.  (There have been systems where private was not correctly
++   implemented like the infamous i386 svr4.0, and systems where the
++   VM page cache was not coherent with the file system buffer cache
++   like early versions of FreeBSD and possibly contemporary NetBSD.)
++   For shared mappings, we should conversely verify that changes get
++   propagated back to all the places they're supposed to be.
++
++   Grep wants private fixed already mapped.
++   The main things grep needs to know about mmap are:
++   * does it exist and is it safe to write into the mmap'd area
++   * how to use it (BSD variants)  */
++
++#include <fcntl.h>
++#include <sys/mman.h>
++
++#if !STDC_HEADERS && !HAVE_STDLIB_H
++char *malloc ();
++#endif
++
++/* This mess was copied from the GNU getpagesize.h.  */
++#if !HAVE_GETPAGESIZE
++/* Assume that all systems that can run configure have sys/param.h.  */
++# if !HAVE_SYS_PARAM_H
++#  define HAVE_SYS_PARAM_H 1
++# endif
++
++# ifdef _SC_PAGESIZE
++#  define getpagesize() sysconf(_SC_PAGESIZE)
++# else /* no _SC_PAGESIZE */
++#  if HAVE_SYS_PARAM_H
++#   include <sys/param.h>
++#   ifdef EXEC_PAGESIZE
++#    define getpagesize() EXEC_PAGESIZE
++#   else /* no EXEC_PAGESIZE */
++#    ifdef NBPG
++#     define getpagesize() NBPG * CLSIZE
++#     ifndef CLSIZE
++#      define CLSIZE 1
++#     endif /* no CLSIZE */
++#    else /* no NBPG */
++#     ifdef NBPC
++#      define getpagesize() NBPC
++#     else /* no NBPC */
++#      ifdef PAGESIZE
++#       define getpagesize() PAGESIZE
++#      endif /* PAGESIZE */
++#     endif /* no NBPC */
++#    endif /* no NBPG */
++#   endif /* no EXEC_PAGESIZE */
++#  else /* no HAVE_SYS_PARAM_H */
++#   define getpagesize() 8192	/* punt totally */
++#  endif /* no HAVE_SYS_PARAM_H */
++# endif /* no _SC_PAGESIZE */
++
++#endif /* no HAVE_GETPAGESIZE */
++
++int
++main ()
++{
++  char *data, *data2, *data3;
++  int i, pagesize;
++  int fd;
++
++  pagesize = getpagesize ();
++
++  /* First, make a file with some known garbage in it. */
++  data = (char *) malloc (pagesize);
++  if (!data)
++    exit (1);
++  for (i = 0; i < pagesize; ++i)
++    *(data + i) = rand ();
++  umask (0);
++  fd = creat ("conftest.mmap", 0600);
++  if (fd < 0)
++    exit (1);
++  if (write (fd, data, pagesize) != pagesize)
++    exit (1);
++  close (fd);
++
++  /* Next, try to mmap the file at a fixed address which already has
++     something else allocated at it.  If we can, also make sure that
++     we see the same garbage.  */
++  fd = open ("conftest.mmap", O_RDWR);
++  if (fd < 0)
++    exit (1);
++  data2 = (char *) malloc (2 * pagesize);
++  if (!data2)
++    exit (1);
++  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
++  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
++		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
++    exit (1);
++  for (i = 0; i < pagesize; ++i)
++    if (*(data + i) != *(data2 + i))
++      exit (1);
++
++  /* Finally, make sure that changes to the mapped area do not
++     percolate back to the file as seen by read().  (This is a bug on
++     some variants of i386 svr4.0.)  */
++  for (i = 0; i < pagesize; ++i)
++    *(data2 + i) = *(data2 + i) + 1;
++  data3 = (char *) malloc (pagesize);
++  if (!data3)
++    exit (1);
++  if (read (fd, data3, pagesize) != pagesize)
++    exit (1);
++  for (i = 0; i < pagesize; ++i)
++    if (*(data + i) != *(data3 + i))
++      exit (1);
++  close (fd);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_mmap_fixed_mapped=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_mmap_fixed_mapped=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
++if test $ac_cv_func_mmap_fixed_mapped = yes; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_MMAP 1
++_ACEOF
++
++fi
++rm -f conftest.mmap
++
++
++
++
++
++
++for ac_header in capability.h sys/capability.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ -------------------------------------- @%:@@%:@
++@%:@@%:@ Report this to heimdal-bugs@pdc.kth.se @%:@@%:@
++@%:@@%:@ -------------------------------------- @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++
++for ac_func in sgi_getcapabilitybyname cap_set_proc
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for getpwnam_r" >&5
++echo $ECHO_N "checking for getpwnam_r... $ECHO_C" >&6
++if test "${ac_cv_funclib_getpwnam_r+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_getpwnam_r\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" c_r; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++getpwnam_r()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_getpwnam_r=$ac_lib; else ac_cv_funclib_getpwnam_r=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_getpwnam_r=\${ac_cv_funclib_getpwnam_r-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_getpwnam_r"
++
++if false; then
++	
++for ac_func in getpwnam_r
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# getpwnam_r
++eval "ac_tr_func=HAVE_`echo getpwnam_r | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_getpwnam_r=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_getpwnam_r=yes"
++	eval "LIB_getpwnam_r="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_getpwnam_r=no"
++	eval "LIB_getpwnam_r="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_getpwnam_r=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test "$ac_cv_func_getpwnam_r" = yes; then
++	echo "$as_me:$LINENO: checking if getpwnam_r is posix" >&5
++echo $ECHO_N "checking if getpwnam_r is posix... $ECHO_C" >&6
++if test "${ac_cv_func_getpwnam_r_posix+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_libs="$LIBS"
++	LIBS="$LIBS $LIB_getpwnam_r"
++	if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <pwd.h>
++int main()
++{
++	struct passwd pw, *pwd;
++	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
++}
++
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getpwnam_r_posix=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_getpwnam_r_posix=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++LIBS="$ac_libs"
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getpwnam_r_posix" >&5
++echo "${ECHO_T}$ac_cv_func_getpwnam_r_posix" >&6
++if test "$ac_cv_func_getpwnam_r_posix" = yes; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define POSIX_GETPWNAM_R 1
++_ACEOF
++
++fi
++fi
++
++
++
++
++for ac_func in getudbnam setlim
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_addr in struct utmp" >&5
++echo $ECHO_N "checking for ut_addr in struct utmp... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmp_ut_addr+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmp.h>
++int
++main ()
++{
++struct utmp x; x.ut_addr;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmp_ut_addr=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmp_ut_addr=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmp_ut_addr" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_addr" >&6
++if test "$ac_cv_type_struct_utmp_ut_addr" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMP_UT_ADDR 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_host in struct utmp" >&5
++echo $ECHO_N "checking for ut_host in struct utmp... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmp_ut_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmp.h>
++int
++main ()
++{
++struct utmp x; x.ut_host;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmp_ut_host=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmp_ut_host=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmp_ut_host" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_host" >&6
++if test "$ac_cv_type_struct_utmp_ut_host" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMP_UT_HOST 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_id in struct utmp" >&5
++echo $ECHO_N "checking for ut_id in struct utmp... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmp_ut_id+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmp.h>
++int
++main ()
++{
++struct utmp x; x.ut_id;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmp_ut_id=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmp_ut_id=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmp_ut_id" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_id" >&6
++if test "$ac_cv_type_struct_utmp_ut_id" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMP_UT_ID 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_pid in struct utmp" >&5
++echo $ECHO_N "checking for ut_pid in struct utmp... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmp_ut_pid+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmp.h>
++int
++main ()
++{
++struct utmp x; x.ut_pid;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmp_ut_pid=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmp_ut_pid=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmp_ut_pid" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_pid" >&6
++if test "$ac_cv_type_struct_utmp_ut_pid" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMP_UT_PID 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_type in struct utmp" >&5
++echo $ECHO_N "checking for ut_type in struct utmp... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmp_ut_type+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmp.h>
++int
++main ()
++{
++struct utmp x; x.ut_type;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmp_ut_type=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmp_ut_type=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmp_ut_type" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_type" >&6
++if test "$ac_cv_type_struct_utmp_ut_type" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMP_UT_TYPE 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_user in struct utmp" >&5
++echo $ECHO_N "checking for ut_user in struct utmp... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmp_ut_user+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmp.h>
++int
++main ()
++{
++struct utmp x; x.ut_user;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmp_ut_user=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmp_ut_user=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmp_ut_user" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_user" >&6
++if test "$ac_cv_type_struct_utmp_ut_user" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMP_UT_USER 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_exit in struct utmpx" >&5
++echo $ECHO_N "checking for ut_exit in struct utmpx... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmpx_ut_exit+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmpx.h>
++int
++main ()
++{
++struct utmpx x; x.ut_exit;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmpx_ut_exit=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmpx_ut_exit=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_exit" >&6
++if test "$ac_cv_type_struct_utmpx_ut_exit" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMPX_UT_EXIT 1
++_ACEOF
++
++	
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for ut_syslen in struct utmpx" >&5
++echo $ECHO_N "checking for ut_syslen in struct utmpx... $ECHO_C" >&6
++if test "${ac_cv_type_struct_utmpx_ut_syslen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <utmpx.h>
++int
++main ()
++{
++struct utmpx x; x.ut_syslen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_struct_utmpx_ut_syslen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_struct_utmpx_ut_syslen=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
++echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_syslen" >&6
++if test "$ac_cv_type_struct_utmpx_ut_syslen" = yes; then
++	
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_STRUCT_UTMPX_UT_SYSLEN 1
++_ACEOF
++
++	
++fi
++
++
++
++echo "$as_me:$LINENO: checking for int8_t" >&5
++echo $ECHO_N "checking for int8_t... $ECHO_C" >&6
++if test "${ac_cv_type_int8_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((int8_t *) 0)
++  return 0;
++if (sizeof (int8_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int8_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int8_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int8_t" >&5
++echo "${ECHO_T}$ac_cv_type_int8_t" >&6
++if test $ac_cv_type_int8_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INT8_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for int16_t" >&5
++echo $ECHO_N "checking for int16_t... $ECHO_C" >&6
++if test "${ac_cv_type_int16_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((int16_t *) 0)
++  return 0;
++if (sizeof (int16_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int16_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int16_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int16_t" >&5
++echo "${ECHO_T}$ac_cv_type_int16_t" >&6
++if test $ac_cv_type_int16_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INT16_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for int32_t" >&5
++echo $ECHO_N "checking for int32_t... $ECHO_C" >&6
++if test "${ac_cv_type_int32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((int32_t *) 0)
++  return 0;
++if (sizeof (int32_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int32_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int32_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int32_t" >&5
++echo "${ECHO_T}$ac_cv_type_int32_t" >&6
++if test $ac_cv_type_int32_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INT32_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for int64_t" >&5
++echo $ECHO_N "checking for int64_t... $ECHO_C" >&6
++if test "${ac_cv_type_int64_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((int64_t *) 0)
++  return 0;
++if (sizeof (int64_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int64_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int64_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int64_t" >&5
++echo "${ECHO_T}$ac_cv_type_int64_t" >&6
++if test $ac_cv_type_int64_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_INT64_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for u_int8_t" >&5
++echo $ECHO_N "checking for u_int8_t... $ECHO_C" >&6
++if test "${ac_cv_type_u_int8_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((u_int8_t *) 0)
++  return 0;
++if (sizeof (u_int8_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_u_int8_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_u_int8_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_u_int8_t" >&5
++echo "${ECHO_T}$ac_cv_type_u_int8_t" >&6
++if test $ac_cv_type_u_int8_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_U_INT8_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for u_int16_t" >&5
++echo $ECHO_N "checking for u_int16_t... $ECHO_C" >&6
++if test "${ac_cv_type_u_int16_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((u_int16_t *) 0)
++  return 0;
++if (sizeof (u_int16_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_u_int16_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_u_int16_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_u_int16_t" >&5
++echo "${ECHO_T}$ac_cv_type_u_int16_t" >&6
++if test $ac_cv_type_u_int16_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_U_INT16_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for u_int32_t" >&5
++echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6
++if test "${ac_cv_type_u_int32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((u_int32_t *) 0)
++  return 0;
++if (sizeof (u_int32_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_u_int32_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_u_int32_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
++echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6
++if test $ac_cv_type_u_int32_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_U_INT32_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for u_int64_t" >&5
++echo $ECHO_N "checking for u_int64_t... $ECHO_C" >&6
++if test "${ac_cv_type_u_int64_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((u_int64_t *) 0)
++  return 0;
++if (sizeof (u_int64_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_u_int64_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_u_int64_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_u_int64_t" >&5
++echo "${ECHO_T}$ac_cv_type_u_int64_t" >&6
++if test $ac_cv_type_u_int64_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_U_INT64_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for uint8_t" >&5
++echo $ECHO_N "checking for uint8_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint8_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((uint8_t *) 0)
++  return 0;
++if (sizeof (uint8_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_uint8_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_uint8_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint8_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint8_t" >&6
++if test $ac_cv_type_uint8_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_UINT8_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for uint16_t" >&5
++echo $ECHO_N "checking for uint16_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint16_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((uint16_t *) 0)
++  return 0;
++if (sizeof (uint16_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_uint16_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_uint16_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint16_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint16_t" >&6
++if test $ac_cv_type_uint16_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_UINT16_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for uint32_t" >&5
++echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint32_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((uint32_t *) 0)
++  return 0;
++if (sizeof (uint32_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_uint32_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_uint32_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint32_t" >&6
++if test $ac_cv_type_uint32_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_UINT32_T 1
++_ACEOF
++
++
++fi
++echo "$as_me:$LINENO: checking for uint64_t" >&5
++echo $ECHO_N "checking for uint64_t... $ECHO_C" >&6
++if test "${ac_cv_type_uint64_t+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++
++
++int
++main ()
++{
++if ((uint64_t *) 0)
++  return 0;
++if (sizeof (uint64_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_uint64_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_uint64_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_uint64_t" >&5
++echo "${ECHO_T}$ac_cv_type_uint64_t" >&6
++if test $ac_cv_type_uint64_t = yes; then
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define HAVE_UINT64_T 1
++_ACEOF
++
++
++fi
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking for el_init" >&5
++echo $ECHO_N "checking for el_init... $ECHO_C" >&6
++if test "${ac_cv_funclib_el_init+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++if eval "test \"\$ac_cv_func_el_init\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" edit; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib $LIB_tgetent $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++el_init()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_el_init=$ac_lib; else ac_cv_funclib_el_init=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_el_init=\${ac_cv_funclib_el_init-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_el_init"
++
++if false; then
++	
++for ac_func in el_init
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++fi
++# el_init
++eval "ac_tr_func=HAVE_`echo el_init | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_el_init=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_el_init=yes"
++	eval "LIB_el_init="
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_el_init=no"
++	eval "LIB_el_init="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_el_init=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++@%:@define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++
++if test "$ac_cv_func_el_init" = yes ; then
++	echo "$as_me:$LINENO: checking for four argument el_init" >&5
++echo $ECHO_N "checking for four argument el_init... $ECHO_C" >&6
++if test "${ac_cv_func_el_init_four+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdio.h>
++			#include <histedit.h>
++int
++main ()
++{
++el_init("", NULL, NULL, NULL);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_el_init_four=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_el_init_four=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_el_init_four" >&5
++echo "${ECHO_T}$ac_cv_func_el_init_four" >&6
++	if test "$ac_cv_func_el_init_four" = yes; then
++		
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_FOUR_VALUED_EL_INIT 1
++_ACEOF
++
++	fi
++fi
++
++
++ac_foo=no
++if test "$with_readline" = yes; then
++	:
++elif test "$ac_cv_func_readline" = yes; then
++	:
++elif test "$ac_cv_func_el_init" = yes; then
++	ac_foo=yes
++	DIR_readline="editline"
++	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)"
++else
++	DIR_readline="editline"
++	LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)"
++fi
++
++
++if test "$ac_foo" = yes; then
++  el_compat_TRUE=
++  el_compat_FALSE='#'
++else
++  el_compat_TRUE='#'
++  el_compat_FALSE=
++fi
++
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_READLINE 1
++_ACEOF
++
++
++
++
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define AUTHENTICATION 1
++_ACEOF
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENCRYPTION 1
++_ACEOF
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define DES_ENCRYPTION 1
++_ACEOF
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define DIAGNOSTICS 1
++_ACEOF
++
++cat >>confdefs.h <<\_ACEOF
++@%:@define OLD_ENVIRON 1
++_ACEOF
++if false; then
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define ENV_HACK 1
++_ACEOF
++
++fi
++
++# Simple test for streamspty, based on the existance of getmsg(), alas
++# this breaks on SunOS4 which have streams but BSD-like ptys
++#
++# And also something wierd has happend with dec-osf1, fallback to bsd-ptys
++
++case "$host" in
++*-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[01]*)
++	;;
++*)
++	echo "$as_me:$LINENO: checking for getmsg" >&5
++echo $ECHO_N "checking for getmsg... $ECHO_C" >&6
++if test "${ac_cv_func_getmsg+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define getmsg to an innocuous variant, in case <limits.h> declares getmsg.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define getmsg innocuous_getmsg
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char getmsg (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef getmsg
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char getmsg ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_getmsg) || defined (__stub___getmsg)
++choke me
++#else
++char (*f) () = getmsg;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != getmsg;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getmsg=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_getmsg=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getmsg" >&5
++echo "${ECHO_T}$ac_cv_func_getmsg" >&6
++
++	if test "$ac_cv_func_getmsg" = "yes"; then
++		echo "$as_me:$LINENO: checking if getmsg works" >&5
++echo $ECHO_N "checking if getmsg works... $ECHO_C" >&6
++if test "${ac_cv_func_getmsg_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$cross_compiling" = yes; then
++  ac_cv_func_getmsg_works=no
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++			#include <stdio.h>
++			#include <errno.h>
++
++			int main()
++			{
++			  int ret;
++			  ret = getmsg(open("/dev/null", 0), NULL, NULL, NULL);
++			  if(ret < 0 && errno == ENOSYS)
++			    return 1;
++			  return 0;
++			}
++			
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_getmsg_works=yes
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++ac_cv_func_getmsg_works=no
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_getmsg_works" >&5
++echo "${ECHO_T}$ac_cv_func_getmsg_works" >&6
++		if test "$ac_cv_func_getmsg_works" = "yes"; then
++			
++cat >>confdefs.h <<\_ACEOF
++@%:@define HAVE_GETMSG 1
++_ACEOF
++
++			
++cat >>confdefs.h <<\_ACEOF
++@%:@define STREAMSPTY 1
++_ACEOF
++
++		fi
++	fi
++	;;
++esac
++
++
++
++
++
++
++
++# Extract the first word of "compile_et", so it can be a program name with args.
++set dummy compile_et; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_COMPILE_ET+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$COMPILE_ET"; then
++  ac_cv_prog_COMPILE_ET="$COMPILE_ET" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_COMPILE_ET="compile_et"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++COMPILE_ET=$ac_cv_prog_COMPILE_ET
++if test -n "$COMPILE_ET"; then
++  echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
++echo "${ECHO_T}$COMPILE_ET" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++krb_cv_compile_et="no"
++krb_cv_com_err_need_r=""
++if test "${COMPILE_ET}" = "compile_et"; then
++
++echo "$as_me:$LINENO: checking whether compile_et has the features we need" >&5
++echo $ECHO_N "checking whether compile_et has the features we need... $ECHO_C" >&6
++cat > conftest_et.et <<'EOF'
++error_table test conf
++prefix CONFTEST
++index 1
++error_code CODE1, "CODE1"
++index 128
++error_code CODE2, "CODE2"
++end
++EOF
++if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
++    save_CPPFLAGS="${CPPFLAGS}"
++  if test -d "/usr/include/et"; then
++    CPPFLAGS="-I/usr/include/et ${CPPFLAGS}"
++  fi
++    if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <com_err.h>
++#include <string.h>
++#include "conftest_et.h"
++int main(){
++#ifndef ERROR_TABLE_BASE_conf
++#error compile_et does not handle error_table N M
++#endif
++return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
++  
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_compile_et="yes"
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++CPPFLAGS="${save_CPPFLAGS}"
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++echo "$as_me:$LINENO: result: ${krb_cv_compile_et}" >&5
++echo "${ECHO_T}${krb_cv_compile_et}" >&6
++if test "${krb_cv_compile_et}" = "yes"; then
++  echo "$as_me:$LINENO: checking for if com_err needs to have a initialize_error_table_r" >&5
++echo $ECHO_N "checking for if com_err needs to have a initialize_error_table_r... $ECHO_C" >&6
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include "conftest_et.c"
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "initialize_error_table_r" >/dev/null 2>&1; then
++  krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"
++fi
++rm -f conftest*
++
++  if test X"$krb_cv_com_err_need_r" = X ; then
++    echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  else
++    echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  fi
++fi
++rm -fr conftest*
++fi
++
++if test "${krb_cv_compile_et}" = "yes"; then
++    krb_cv_save_LIBS="${LIBS}"
++  LIBS="${LIBS} -lcom_err"
++  echo "$as_me:$LINENO: checking for com_err" >&5
++echo $ECHO_N "checking for com_err... $ECHO_C" >&6
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <com_err.h>
++int
++main ()
++{
++
++    const char *p;
++    p = error_message(0);
++    $krb_cv_com_err_need_r
++  
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_com_err="yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++  echo "$as_me:$LINENO: result: ${krb_cv_com_err}" >&5
++echo "${ECHO_T}${krb_cv_com_err}" >&6
++  LIBS="${krb_cv_save_LIBS}"
++else
++    krb_cv_com_err="no"
++fi
++
++if test "${krb_cv_com_err}" = "yes"; then
++    DIR_com_err=""
++    LIB_com_err="-lcom_err"
++    LIB_com_err_a=""
++    LIB_com_err_so=""
++    { echo "$as_me:$LINENO: Using the already-installed com_err" >&5
++echo "$as_me: Using the already-installed com_err" >&6;}
++else
++    COMPILE_ET="\$(top_builddir)/lib/com_err/compile_et"
++    DIR_com_err="com_err"
++    LIB_com_err="\$(top_builddir)/lib/com_err/libcom_err.la"
++    LIB_com_err_a="\$(top_builddir)/lib/com_err/.libs/libcom_err.a"
++    LIB_com_err_so="\$(top_builddir)/lib/com_err/.libs/libcom_err.so"
++    { echo "$as_me:$LINENO: Using our own com_err" >&5
++echo "$as_me: Using our own com_err" >&6;}
++fi
++
++
++
++
++
++
++
++
++echo "$as_me:$LINENO: checking which authentication modules should be built" >&5
++echo $ECHO_N "checking which authentication modules should be built... $ECHO_C" >&6
++
++z='sia afskauthlib'
++LIB_AUTH_SUBDIRS=
++for i in $z; do
++case $i in
++sia)
++if test "$ac_cv_header_siad_h" = yes; then
++	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS sia"
++fi
++;;
++pam)
++case "${host}" in
++*-*-freebsd*)	ac_cv_want_pam_krb4=no ;;
++*)		ac_cv_want_pam_krb4=yes ;;
++esac
++
++if test "$ac_cv_want_pam_krb4" = yes -a \
++    "$ac_cv_header_security_pam_modules_h" = yes -a \
++    "$enable_shared" = yes; then
++	LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS pam"
++fi
++;;
++afskauthlib)
++case "${host}" in
++*-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
++esac
++;;
++esac
++done
++if test "$LIB_AUTH_SUBDIRS"; then
++	echo "$as_me:$LINENO: result: $LIB_AUTH_SUBDIRS" >&5
++echo "${ECHO_T}$LIB_AUTH_SUBDIRS" >&6
++else
++	echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6
++fi
++
++
++
++
++# This is done by AC_OUTPUT but we need the result here.
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++
++	x="${bindir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define BINDIR "$x"
++_ACEOF
++
++	x="${libdir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define LIBDIR "$x"
++_ACEOF
++
++	x="${libexecdir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define LIBEXECDIR "$x"
++_ACEOF
++
++	x="${localstatedir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define LOCALSTATEDIR "$x"
++_ACEOF
++
++	x="${sbindir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SBINDIR "$x"
++_ACEOF
++
++	x="${sysconfdir}"
++	eval y="$x"
++	while test "x$y" != "x$x"; do
++		x="$y"
++		eval y="$x"
++	done
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define SYSCONFDIR "$x"
++_ACEOF
++
++
++
++LTLIBOBJS=`echo "$LIB@&t@OBJS" |
++	sed 's,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,'`
++
++
++
++
++
++                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile include/Makefile include/kadm5/Makefile lib/Makefile lib/45/Makefile lib/auth/Makefile lib/auth/afskauthlib/Makefile lib/auth/pam/Makefile lib/auth/sia/Makefile lib/asn1/Makefile lib/com_err/Makefile lib/des/Makefile lib/editline/Makefile lib/gssapi/Makefile lib/hdb/Makefile lib/kadm5/Makefile lib/kafs/Makefile lib/kdfs/Makefile lib/krb5/Makefile lib/otp/Makefile lib/roken/Makefile lib/sl/Makefile lib/vers/Makefile kuser/Makefile kpasswd/Makefile kadmin/Makefile admin/Makefile kdc/Makefile appl/Makefile appl/afsutil/Makefile appl/ftp/Makefile appl/ftp/common/Makefile appl/ftp/ftp/Makefile appl/ftp/ftpd/Makefile appl/kx/Makefile appl/login/Makefile appl/otp/Makefile appl/popper/Makefile appl/push/Makefile appl/rsh/Makefile appl/rcp/Makefile appl/su/Makefile appl/xnlock/Makefile appl/telnet/Makefile appl/telnet/libtelnet/Makefile appl/telnet/telnet/Makefile appl/telnet/telnetd/Makefile appl/test/Makefile appl/kf/Makefile appl/dceutils/Makefile doc/Makefile tools/Makefile"
++
++
++cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
++_ACEOF
++
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++{
++  (set) 2>&1 |
++    case `(ac_space=' '; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      # `set' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;;
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++} |
++  sed '
++     t clear
++     : clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     : end' >>confcache
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
++  if test -w $cache_file; then
++    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++    cat confcache >$cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/;
++s/:*\${srcdir}:*/:/;
++s/:*@srcdir@:*/:/;
++s/^\([^=]*=[	 ]*\):*/\1/;
++s/:*$//;
++s/^[^=]*=[	 ]*$//;
++}'
++fi
++
++DEFS=-DHAVE_CONFIG_H
++
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIB@&t@OBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${KRB4_TRUE}" && test -z "${KRB4_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"KRB4\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"KRB4\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${KRB5_TRUE}" && test -z "${KRB5_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"KRB5\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"KRB5\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${do_roken_rename_TRUE}" && test -z "${do_roken_rename_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"do_roken_rename\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"do_roken_rename\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_OPENSSL_TRUE}" && test -z "${HAVE_OPENSSL_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_OPENSSL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_OPENSSL\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${DCE_TRUE}" && test -z "${DCE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"DCE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"DCE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_DB1_TRUE}" && test -z "${HAVE_DB1_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_DB1\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_DB1\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_DB3_TRUE}" && test -z "${HAVE_DB3_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_DB3\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_DB3\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_NDBM_TRUE}" && test -z "${HAVE_NDBM_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_NDBM\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_NDBM\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${have_err_h_TRUE}" && test -z "${have_err_h_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"have_err_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"have_err_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${have_fnmatch_h_TRUE}" && test -z "${have_fnmatch_h_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"have_fnmatch_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"have_fnmatch_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${have_ifaddrs_h_TRUE}" && test -z "${have_ifaddrs_h_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"have_ifaddrs_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"have_ifaddrs_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${have_vis_h_TRUE}" && test -z "${have_vis_h_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"have_vis_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"have_vis_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${have_glob_h_TRUE}" && test -z "${have_glob_h_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"have_glob_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"have_glob_h\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${OTP_TRUE}" && test -z "${OTP_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"OTP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"OTP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${CATMAN_TRUE}" && test -z "${CATMAN_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"CATMAN\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"CATMAN\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${AIX_TRUE}" && test -z "${AIX_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"AIX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"AIX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${AIX4_TRUE}" && test -z "${AIX4_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"AIX4\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"AIX4\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_DLOPEN_TRUE}" && test -z "${HAVE_DLOPEN_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_DLOPEN\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_DLOPEN\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${AIX_DYNAMIC_AFS_TRUE}" && test -z "${AIX_DYNAMIC_AFS_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"AIX_DYNAMIC_AFS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"AIX_DYNAMIC_AFS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${IRIX_TRUE}" && test -z "${IRIX_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"IRIX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"IRIX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${HAVE_X_TRUE}" && test -z "${HAVE_X_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"HAVE_X\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"HAVE_X\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${NEED_WRITEAUTH_TRUE}" && test -z "${NEED_WRITEAUTH_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"NEED_WRITEAUTH\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"NEED_WRITEAUTH\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "${el_compat_TRUE}" && test -z "${el_compat_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"el_compat\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"el_compat\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++: ${CONFIG_STATUS=./config.status}
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF
++#! $SHELL
++# Generated by $as_me.
++# Run this file to recreate the current configuration.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
++
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++for as_var in \
++  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
++  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
++  LC_TELEPHONE LC_TIME
++do
++  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
++    eval $as_var=C; export $as_var
++  else
++    $as_unset $as_var
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  echo "#! /bin/sh" >conf$$.sh
++  echo  "exit 0"   >>conf$$.sh
++  chmod +x conf$$.sh
++  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++    PATH_SEPARATOR=';'
++  else
++    PATH_SEPARATOR=:
++  fi
++  rm -f conf$$.sh
++fi
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
++echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++   { (exit 1); exit 1; }; }
++
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++exec 6>&1
++
++# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.  Logging --version etc. is OK.
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
++@%:@@%:@ Running $as_me. @%:@@%:@
++_ASBOX
++} >&5
++cat >&5 <<_CSEOF
++
++This file was extended by Heimdal $as_me 0.6.3, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  CONFIG_FILES    = $CONFIG_FILES
++  CONFIG_HEADERS  = $CONFIG_HEADERS
++  CONFIG_LINKS    = $CONFIG_LINKS
++  CONFIG_COMMANDS = $CONFIG_COMMANDS
++  $ $0 $@
++
++_CSEOF
++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
++echo >&5
++_ACEOF
++
++# Files that config.status was made for.
++if test -n "$ac_config_files"; then
++  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_headers"; then
++  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_links"; then
++  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_commands"; then
++  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
++fi
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
++
++Usage: $0 [OPTIONS] [FILE]...
++
++  -h, --help       print this help, then exit
++  -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
++  -d, --debug      don't remove temporary files
++      --recheck    update $as_me by reconfiguring in the same conditions
++  --file=FILE[:TEMPLATE]
++		   instantiate the configuration file FILE
++  --header=FILE[:TEMPLATE]
++		   instantiate the configuration header FILE
++
++Configuration files:
++$config_files
++
++Configuration headers:
++$config_headers
++
++Report bugs to <bug-autoconf@gnu.org>."
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++ac_cs_version="\\
++Heimdal config.status 0.6.3
++configured by $0, generated by GNU Autoconf 2.59,
++  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This config.status script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it."
++srcdir=$srcdir
++INSTALL="$INSTALL"
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If no file are specified by the user, then we need to provide default
++# value.  By we need to know if files were specified by the user.
++ac_need_defaults=:
++while test $# != 0
++do
++  case $1 in
++  --*=*)
++    ac_option=`expr "x$1" : 'x\([^=]*\)='`
++    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
++    ;;
++  *) # This is not an option, so the user has probably given explicit
++     # arguments.
++     ac_option=$1
++     ac_need_defaults=false;;
++  esac
++
++  case $ac_option in
++  # Handling of the options.
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
++  --version | --vers* | -V )
++    echo "$ac_cs_version"; exit 0 ;;
++  --he | --h)
++    # Conflict between --help and --header
++    { { echo "$as_me:$LINENO: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit 0 ;;
++  --debug | --d* | -d )
++    debug=: ;;
++  --file | --fil | --fi | --f )
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
++
++  # This is an error.
++  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; } ;;
++
++  *) ac_config_targets="$ac_config_targets $1" ;;
++
++  esac
++  shift
++done
++
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
++_ACEOF
++
++
++
++
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_config_target in $ac_config_targets
++do
++  case "$ac_config_target" in
++  # Handling of arguments.
++  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
++  "include/kadm5/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/kadm5/Makefile" ;;
++  "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
++  "lib/45/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/45/Makefile" ;;
++  "lib/auth/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/Makefile" ;;
++  "lib/auth/afskauthlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/afskauthlib/Makefile" ;;
++  "lib/auth/pam/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/pam/Makefile" ;;
++  "lib/auth/sia/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/auth/sia/Makefile" ;;
++  "lib/asn1/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/asn1/Makefile" ;;
++  "lib/com_err/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/com_err/Makefile" ;;
++  "lib/des/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/des/Makefile" ;;
++  "lib/editline/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/editline/Makefile" ;;
++  "lib/gssapi/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/gssapi/Makefile" ;;
++  "lib/hdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/hdb/Makefile" ;;
++  "lib/kadm5/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kadm5/Makefile" ;;
++  "lib/kafs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kafs/Makefile" ;;
++  "lib/kdfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/kdfs/Makefile" ;;
++  "lib/krb5/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/krb5/Makefile" ;;
++  "lib/otp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/otp/Makefile" ;;
++  "lib/roken/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/roken/Makefile" ;;
++  "lib/sl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/sl/Makefile" ;;
++  "lib/vers/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/vers/Makefile" ;;
++  "kuser/Makefile" ) CONFIG_FILES="$CONFIG_FILES kuser/Makefile" ;;
++  "kpasswd/Makefile" ) CONFIG_FILES="$CONFIG_FILES kpasswd/Makefile" ;;
++  "kadmin/Makefile" ) CONFIG_FILES="$CONFIG_FILES kadmin/Makefile" ;;
++  "admin/Makefile" ) CONFIG_FILES="$CONFIG_FILES admin/Makefile" ;;
++  "kdc/Makefile" ) CONFIG_FILES="$CONFIG_FILES kdc/Makefile" ;;
++  "appl/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/Makefile" ;;
++  "appl/afsutil/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/afsutil/Makefile" ;;
++  "appl/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/Makefile" ;;
++  "appl/ftp/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/common/Makefile" ;;
++  "appl/ftp/ftp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/ftp/Makefile" ;;
++  "appl/ftp/ftpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/ftp/ftpd/Makefile" ;;
++  "appl/kx/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/kx/Makefile" ;;
++  "appl/login/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/login/Makefile" ;;
++  "appl/otp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/otp/Makefile" ;;
++  "appl/popper/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/popper/Makefile" ;;
++  "appl/push/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/push/Makefile" ;;
++  "appl/rsh/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/rsh/Makefile" ;;
++  "appl/rcp/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/rcp/Makefile" ;;
++  "appl/su/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/su/Makefile" ;;
++  "appl/xnlock/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/xnlock/Makefile" ;;
++  "appl/telnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/Makefile" ;;
++  "appl/telnet/libtelnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/libtelnet/Makefile" ;;
++  "appl/telnet/telnet/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/telnet/Makefile" ;;
++  "appl/telnet/telnetd/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/telnet/telnetd/Makefile" ;;
++  "appl/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/test/Makefile" ;;
++  "appl/kf/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/kf/Makefile" ;;
++  "appl/dceutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES appl/dceutils/Makefile" ;;
++  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++  "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
++  "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
++  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# If the user did not use the arguments to specify the items to instantiate,
++# then the envvar interface is used.  Set only those that are not.
++# We use the long form for the default assignment because of an extremely
++# bizarre bug on SunOS 4.1.3.
++if $ac_need_defaults; then
++  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
++  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++fi
++
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
++# Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++
++{
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=./confstat$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in ." >&2
++   { (exit 1); exit 1; }
++}
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++
++#
++# CONFIG_FILES section.
++#
++
++# No need to generate the scripts if there are no CONFIG_FILES.
++# This happens for instance when ./config.status config.h
++if test -n "\$CONFIG_FILES"; then
++  # Protect against being on the right side of a sed subst in config.status.
++  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
++   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@SHELL@,$SHELL,;t t
++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++s,@exec_prefix@,$exec_prefix,;t t
++s,@prefix@,$prefix,;t t
++s,@program_transform_name@,$program_transform_name,;t t
++s,@bindir@,$bindir,;t t
++s,@sbindir@,$sbindir,;t t
++s,@libexecdir@,$libexecdir,;t t
++s,@datadir@,$datadir,;t t
++s,@sysconfdir@,$sysconfdir,;t t
++s,@sharedstatedir@,$sharedstatedir,;t t
++s,@localstatedir@,$localstatedir,;t t
++s,@libdir@,$libdir,;t t
++s,@includedir@,$includedir,;t t
++s,@oldincludedir@,$oldincludedir,;t t
++s,@infodir@,$infodir,;t t
++s,@mandir@,$mandir,;t t
++s,@build_alias@,$build_alias,;t t
++s,@host_alias@,$host_alias,;t t
++s,@target_alias@,$target_alias,;t t
++s,@DEFS@,$DEFS,;t t
++s,@ECHO_C@,$ECHO_C,;t t
++s,@ECHO_N@,$ECHO_N,;t t
++s,@ECHO_T@,$ECHO_T,;t t
++s,@LIBS@,$LIBS,;t t
++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s,@MAINT@,$MAINT,;t t
++s,@CC@,$CC,;t t
++s,@CFLAGS@,$CFLAGS,;t t
++s,@LDFLAGS@,$LDFLAGS,;t t
++s,@CPPFLAGS@,$CPPFLAGS,;t t
++s,@ac_ct_CC@,$ac_ct_CC,;t t
++s,@EXEEXT@,$EXEEXT,;t t
++s,@OBJEXT@,$OBJEXT,;t t
++s,@CPP@,$CPP,;t t
++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
++s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@CYGPATH_W@,$CYGPATH_W,;t t
++s,@PACKAGE@,$PACKAGE,;t t
++s,@VERSION@,$VERSION,;t t
++s,@ACLOCAL@,$ACLOCAL,;t t
++s,@AUTOCONF@,$AUTOCONF,;t t
++s,@AUTOMAKE@,$AUTOMAKE,;t t
++s,@AUTOHEADER@,$AUTOHEADER,;t t
++s,@MAKEINFO@,$MAKEINFO,;t t
++s,@AMTAR@,$AMTAR,;t t
++s,@install_sh@,$install_sh,;t t
++s,@STRIP@,$STRIP,;t t
++s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
++s,@AWK@,$AWK,;t t
++s,@SET_MAKE@,$SET_MAKE,;t t
++s,@am__leading_dot@,$am__leading_dot,;t t
++s,@build@,$build,;t t
++s,@build_cpu@,$build_cpu,;t t
++s,@build_vendor@,$build_vendor,;t t
++s,@build_os@,$build_os,;t t
++s,@host@,$host,;t t
++s,@host_cpu@,$host_cpu,;t t
++s,@host_vendor@,$host_vendor,;t t
++s,@host_os@,$host_os,;t t
++s,@CANONICAL_HOST@,$CANONICAL_HOST,;t t
++s,@YACC@,$YACC,;t t
++s,@LEX@,$LEX,;t t
++s,@LEXLIB@,$LEXLIB,;t t
++s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
++s,@LN_S@,$LN_S,;t t
++s,@EGREP@,$EGREP,;t t
++s,@ECHO@,$ECHO,;t t
++s,@AR@,$AR,;t t
++s,@ac_ct_AR@,$ac_ct_AR,;t t
++s,@RANLIB@,$RANLIB,;t t
++s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
++s,@CXX@,$CXX,;t t
++s,@CXXFLAGS@,$CXXFLAGS,;t t
++s,@ac_ct_CXX@,$ac_ct_CXX,;t t
++s,@CXXCPP@,$CXXCPP,;t t
++s,@F77@,$F77,;t t
++s,@FFLAGS@,$FFLAGS,;t t
++s,@ac_ct_F77@,$ac_ct_F77,;t t
++s,@LIBTOOL@,$LIBTOOL,;t t
++s,@WFLAGS@,$WFLAGS,;t t
++s,@WFLAGS_NOUNUSED@,$WFLAGS_NOUNUSED,;t t
++s,@WFLAGS_NOIMPLICITINT@,$WFLAGS_NOIMPLICITINT,;t t
++s,@DIR_openldap@,$DIR_openldap,;t t
++s,@INCLUDE_openldap@,$INCLUDE_openldap,;t t
++s,@LIB_openldap@,$LIB_openldap,;t t
++s,@DIR_krb4@,$DIR_krb4,;t t
++s,@INCLUDE_krb4@,$INCLUDE_krb4,;t t
++s,@LIB_krb4@,$LIB_krb4,;t t
++s,@EXTRA_LIB45@,$EXTRA_LIB45,;t t
++s,@LIB_krb_enable_debug@,$LIB_krb_enable_debug,;t t
++s,@LIB_krb_disable_debug@,$LIB_krb_disable_debug,;t t
++s,@LIB_krb_get_our_ip_for_realm@,$LIB_krb_get_our_ip_for_realm,;t t
++s,@LIB_krb_kdctimeofday@,$LIB_krb_kdctimeofday,;t t
++s,@LIB_krb_get_kdc_time_diff@,$LIB_krb_get_kdc_time_diff,;t t
++s,@KRB4_TRUE@,$KRB4_TRUE,;t t
++s,@KRB4_FALSE@,$KRB4_FALSE,;t t
++s,@KRB5_TRUE@,$KRB5_TRUE,;t t
++s,@KRB5_FALSE@,$KRB5_FALSE,;t t
++s,@do_roken_rename_TRUE@,$do_roken_rename_TRUE,;t t
++s,@do_roken_rename_FALSE@,$do_roken_rename_FALSE,;t t
++s,@LIB_kdb@,$LIB_kdb,;t t
++s,@HAVE_OPENSSL_TRUE@,$HAVE_OPENSSL_TRUE,;t t
++s,@HAVE_OPENSSL_FALSE@,$HAVE_OPENSSL_FALSE,;t t
++s,@DIR_des@,$DIR_des,;t t
++s,@INCLUDE_des@,$INCLUDE_des,;t t
++s,@LIB_des@,$LIB_des,;t t
++s,@LIB_des_a@,$LIB_des_a,;t t
++s,@LIB_des_so@,$LIB_des_so,;t t
++s,@LIB_des_appl@,$LIB_des_appl,;t t
++s,@DCE_TRUE@,$DCE_TRUE,;t t
++s,@DCE_FALSE@,$DCE_FALSE,;t t
++s,@dpagaix_cflags@,$dpagaix_cflags,;t t
++s,@dpagaix_ldadd@,$dpagaix_ldadd,;t t
++s,@dpagaix_ldflags@,$dpagaix_ldflags,;t t
++s,@LIB_db_create@,$LIB_db_create,;t t
++s,@LIB_dbopen@,$LIB_dbopen,;t t
++s,@LIB_dbm_firstkey@,$LIB_dbm_firstkey,;t t
++s,@HAVE_DB1_TRUE@,$HAVE_DB1_TRUE,;t t
++s,@HAVE_DB1_FALSE@,$HAVE_DB1_FALSE,;t t
++s,@HAVE_DB3_TRUE@,$HAVE_DB3_TRUE,;t t
++s,@HAVE_DB3_FALSE@,$HAVE_DB3_FALSE,;t t
++s,@HAVE_NDBM_TRUE@,$HAVE_NDBM_TRUE,;t t
++s,@HAVE_NDBM_FALSE@,$HAVE_NDBM_FALSE,;t t
++s,@DBLIB@,$DBLIB,;t t
++s,@LIB_NDBM@,$LIB_NDBM,;t t
++s,@LIB_crypt@,$LIB_crypt,;t t
++s,@LIB_roken@,$LIB_roken,;t t
++s,@DIR_roken@,$DIR_roken,;t t
++s,@CPPFLAGS_roken@,$CPPFLAGS_roken,;t t
++s,@VOID_RETSIGTYPE@,$VOID_RETSIGTYPE,;t t
++s,@have_err_h_TRUE@,$have_err_h_TRUE,;t t
++s,@have_err_h_FALSE@,$have_err_h_FALSE,;t t
++s,@have_fnmatch_h_TRUE@,$have_fnmatch_h_TRUE,;t t
++s,@have_fnmatch_h_FALSE@,$have_fnmatch_h_FALSE,;t t
++s,@have_ifaddrs_h_TRUE@,$have_ifaddrs_h_TRUE,;t t
++s,@have_ifaddrs_h_FALSE@,$have_ifaddrs_h_FALSE,;t t
++s,@have_vis_h_TRUE@,$have_vis_h_TRUE,;t t
++s,@have_vis_h_FALSE@,$have_vis_h_FALSE,;t t
++s,@LIB_socket@,$LIB_socket,;t t
++s,@LIB_gethostbyname@,$LIB_gethostbyname,;t t
++s,@LIB_syslog@,$LIB_syslog,;t t
++s,@LIB_gethostbyname2@,$LIB_gethostbyname2,;t t
++s,@LIB_res_search@,$LIB_res_search,;t t
++s,@LIB_res_nsearch@,$LIB_res_nsearch,;t t
++s,@LIB_dn_expand@,$LIB_dn_expand,;t t
++s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
++s,@have_glob_h_TRUE@,$have_glob_h_TRUE,;t t
++s,@have_glob_h_FALSE@,$have_glob_h_FALSE,;t t
++s,@LIB_getsockopt@,$LIB_getsockopt,;t t
++s,@LIB_setsockopt@,$LIB_setsockopt,;t t
++s,@LIB_hstrerror@,$LIB_hstrerror,;t t
++s,@LIB_bswap16@,$LIB_bswap16,;t t
++s,@LIB_bswap32@,$LIB_bswap32,;t t
++s,@LIB_pidfile@,$LIB_pidfile,;t t
++s,@LIB_getaddrinfo@,$LIB_getaddrinfo,;t t
++s,@LIB_getnameinfo@,$LIB_getnameinfo,;t t
++s,@LIB_freeaddrinfo@,$LIB_freeaddrinfo,;t t
++s,@LIB_gai_strerror@,$LIB_gai_strerror,;t t
++s,@OTP_TRUE@,$OTP_TRUE,;t t
++s,@OTP_FALSE@,$OTP_FALSE,;t t
++s,@LIB_security@,$LIB_security,;t t
++s,@NROFF@,$NROFF,;t t
++s,@GROFF@,$GROFF,;t t
++s,@CATMAN@,$CATMAN,;t t
++s,@CATMAN_TRUE@,$CATMAN_TRUE,;t t
++s,@CATMAN_FALSE@,$CATMAN_FALSE,;t t
++s,@CATMANEXT@,$CATMANEXT,;t t
++s,@DIR_readline@,$DIR_readline,;t t
++s,@INCLUDE_readline@,$INCLUDE_readline,;t t
++s,@LIB_readline@,$LIB_readline,;t t
++s,@DIR_hesiod@,$DIR_hesiod,;t t
++s,@INCLUDE_hesiod@,$INCLUDE_hesiod,;t t
++s,@LIB_hesiod@,$LIB_hesiod,;t t
++s,@DIR_sl@,$DIR_sl,;t t
++s,@INCLUDE_sl@,$INCLUDE_sl,;t t
++s,@LIB_sl@,$LIB_sl,;t t
++s,@DIR_ss@,$DIR_ss,;t t
++s,@INCLUDE_ss@,$INCLUDE_ss,;t t
++s,@LIB_ss@,$LIB_ss,;t t
++s,@DIR_otp@,$DIR_otp,;t t
++s,@INCLUDE_otp@,$INCLUDE_otp,;t t
++s,@LIB_otp@,$LIB_otp,;t t
++s,@AIX_TRUE@,$AIX_TRUE,;t t
++s,@AIX_FALSE@,$AIX_FALSE,;t t
++s,@AIX4_TRUE@,$AIX4_TRUE,;t t
++s,@AIX4_FALSE@,$AIX4_FALSE,;t t
++s,@LIB_dlopen@,$LIB_dlopen,;t t
++s,@HAVE_DLOPEN_TRUE@,$HAVE_DLOPEN_TRUE,;t t
++s,@HAVE_DLOPEN_FALSE@,$HAVE_DLOPEN_FALSE,;t t
++s,@LIB_loadquery@,$LIB_loadquery,;t t
++s,@AIX_DYNAMIC_AFS_TRUE@,$AIX_DYNAMIC_AFS_TRUE,;t t
++s,@AIX_DYNAMIC_AFS_FALSE@,$AIX_DYNAMIC_AFS_FALSE,;t t
++s,@AIX_EXTRA_KAFS@,$AIX_EXTRA_KAFS,;t t
++s,@IRIX_TRUE@,$IRIX_TRUE,;t t
++s,@IRIX_FALSE@,$IRIX_FALSE,;t t
++s,@X_CFLAGS@,$X_CFLAGS,;t t
++s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
++s,@X_LIBS@,$X_LIBS,;t t
++s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
++s,@HAVE_X_TRUE@,$HAVE_X_TRUE,;t t
++s,@HAVE_X_FALSE@,$HAVE_X_FALSE,;t t
++s,@LIB_XauWriteAuth@,$LIB_XauWriteAuth,;t t
++s,@LIB_XauReadAuth@,$LIB_XauReadAuth,;t t
++s,@LIB_XauFileName@,$LIB_XauFileName,;t t
++s,@NEED_WRITEAUTH_TRUE@,$NEED_WRITEAUTH_TRUE,;t t
++s,@NEED_WRITEAUTH_FALSE@,$NEED_WRITEAUTH_FALSE,;t t
++s,@LIB_logwtmp@,$LIB_logwtmp,;t t
++s,@LIB_logout@,$LIB_logout,;t t
++s,@LIB_openpty@,$LIB_openpty,;t t
++s,@LIB_tgetent@,$LIB_tgetent,;t t
++s,@LIB_getpwnam_r@,$LIB_getpwnam_r,;t t
++s,@LIB_el_init@,$LIB_el_init,;t t
++s,@el_compat_TRUE@,$el_compat_TRUE,;t t
++s,@el_compat_FALSE@,$el_compat_FALSE,;t t
++s,@COMPILE_ET@,$COMPILE_ET,;t t
++s,@DIR_com_err@,$DIR_com_err,;t t
++s,@LIB_com_err@,$LIB_com_err,;t t
++s,@LIB_com_err_a@,$LIB_com_err_a,;t t
++s,@LIB_com_err_so@,$LIB_com_err_so,;t t
++s,@LIB_AUTH_SUBDIRS@,$LIB_AUTH_SUBDIRS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
++CEOF
++
++_ACEOF
++
++  cat >>$CONFIG_STATUS <<\_ACEOF
++  # Split the substitutions into bite-sized pieces for seds with
++  # small command number limits, like on Digital OSF/1 and HP-UX.
++  ac_max_sed_lines=48
++  ac_sed_frag=1 # Number of current file.
++  ac_beg=1 # First line for current file.
++  ac_end=$ac_max_sed_lines # Line after last line for current file.
++  ac_more_lines=:
++  ac_sed_cmds=
++  while $ac_more_lines; do
++    if test $ac_beg -gt 1; then
++      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    else
++      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    fi
++    if test ! -s $tmp/subs.frag; then
++      ac_more_lines=false
++    else
++      # The purpose of the label and of the branching condition is to
++      # speed up the sed processing (if there are no `@' at all, there
++      # is no need to browse any of the substitutions).
++      # These are the two extra sed commands mentioned above.
++      (echo ':t
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++      if test -z "$ac_sed_cmds"; then
++	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++      else
++	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++      fi
++      ac_sed_frag=`expr $ac_sed_frag + 1`
++      ac_beg=$ac_end
++      ac_end=`expr $ac_end + $ac_max_sed_lines`
++    fi
++  done
++  if test -z "$ac_sed_cmds"; then
++    ac_sed_cmds=cat
++  fi
++fi # test -n "$CONFIG_FILES"
++
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
++  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$ac_file" : 'X\(//\)[^/]' \| \
++	 X"$ac_file" : 'X\(//\)$' \| \
++	 X"$ac_file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$ac_file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  esac
++
++  # Let's still pretend it is `configure' which instantiates (i.e., don't
++  # use $as_me), people would be surprised to read:
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    configure_input=
++  else
++    configure_input="$ac_file.  "
++  fi
++  configure_input=$configure_input"Generated from `echo $ac_file_in |
++				     sed 's,.*/,,'` by configure."
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  sed "$ac_vpsub
++$extrasub
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++:t
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++s,@configure_input@,$configure_input,;t t
++s,@srcdir@,$ac_srcdir,;t t
++s,@abs_srcdir@,$ac_abs_srcdir,;t t
++s,@top_srcdir@,$ac_top_srcdir,;t t
++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
++s,@builddir@,$ac_builddir,;t t
++s,@abs_builddir@,$ac_abs_builddir,;t t
++s,@top_builddir@,$ac_top_builddir,;t t
++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
++s,@INSTALL@,$ac_INSTALL,;t t
++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
++  rm -f $tmp/stdin
++  if test x"$ac_file" != x-; then
++    mv $tmp/out $ac_file
++  else
++    cat $tmp/out
++    rm -f $tmp/out
++  fi
++
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_HEADER section.
++#
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
++ac_dB='[	 ].*$,\1#\2'
++ac_dC=' '
++ac_dD=',;t'
++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
++ac_uB='$,\1#\2define\3'
++ac_uC=' '
++ac_uD=',;t'
++
++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 # Do quote $f, to prevent DOS paths from being IFS'd.
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++  # Remove the trailing spaces.
++  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
++
++_ACEOF
++
++# Transform confdefs.h into two sed scripts, `conftest.defines' and
++# `conftest.undefs', that substitutes the proper values into
++# config.h.in to produce config.h.  The first handles `#define'
++# templates, and the second `#undef' templates.
++# And first: Protect against being on the right side of a sed subst in
++# config.status.  Protect against being in an unquoted here document
++# in config.status.
++rm -f conftest.defines conftest.undefs
++# Using a here document instead of a string reduces the quoting nightmare.
++# Putting comments in sed scripts is not portable.
++#
++# `end' is used to avoid that the second main sed command (meant for
++# 0-ary CPP macros) applies to n-ary macro definitions.
++# See the Autoconf documentation for `clear'.
++cat >confdef2sed.sed <<\_ACEOF
++s/[\\&,]/\\&/g
++s,[\\$`],\\&,g
++t clear
++: clear
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++t end
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
++: end
++_ACEOF
++# If some macros were called several times there might be several times
++# the same #defines, which is useless.  Nevertheless, we may not want to
++# sort them, since we want the *last* AC-DEFINE to be honored.
++uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
++sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
++rm -f confdef2sed.sed
++
++# This sed command replaces #undef with comments.  This is necessary, for
++# example, in the case of _POSIX_SOURCE, which is predefined and required
++# on some systems where configure will not decide to define it.
++cat >>conftest.undefs <<\_ACEOF
++s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++_ACEOF
++
++# Break up conftest.defines because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
++echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
++echo '  :' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.defines >/dev/null
++do
++  # Write a limited-size here document to $tmp/defines.sed.
++  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#define' lines.
++  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/defines.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
++done
++rm -f conftest.defines
++echo '  fi # grep' >>$CONFIG_STATUS
++echo >>$CONFIG_STATUS
++
++# Break up conftest.undefs because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.undefs >/dev/null
++do
++  # Write a limited-size here document to $tmp/undefs.sed.
++  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#undef'
++  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
++  rm -f conftest.undefs
++  mv conftest.tail conftest.undefs
++done
++rm -f conftest.undefs
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++  # Let's still pretend it is `configure' which instantiates (i.e., don't
++  # use $as_me), people would be surprised to read:
++  #    /* config.h.  Generated by config.status.  */
++  if test x"$ac_file" = x-; then
++    echo "/* Generated by configure.  */" >$tmp/config.h
++  else
++    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
++  fi
++  cat $tmp/in >>$tmp/config.h
++  rm -f $tmp/in
++  if test x"$ac_file" != x-; then
++    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
++      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++echo "$as_me: $ac_file is unchanged" >&6;}
++    else
++      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$ac_file" : 'X\(//\)[^/]' \| \
++	 X"$ac_file" : 'X\(//\)$' \| \
++	 X"$ac_file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$ac_file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++      rm -f $ac_file
++      mv $tmp/config.h $ac_file
++    fi
++  else
++    cat $tmp/config.h
++    rm -f $tmp/config.h
++  fi
++# Compute $ac_file's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $ac_file | $ac_file:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X$ac_file : 'X\(//\)[^/]' \| \
++	 X$ac_file : 'X\(//\)$' \| \
++	 X$ac_file : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X$ac_file |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`/stamp-h$_am_stamp_count
++done
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++{ (exit 0); exit 0; }
++_ACEOF
++chmod +x $CONFIG_STATUS
++ac_clean_files=$ac_clean_files_save
++
++
++# configure is writing to config.log, and then calls config.status.
++# config.status does its own redirection, appending to config.log.
++# Unfortunately, on DOS this fails, as config.log is still kept open
++# by configure, so config.status won't be able to write to it; its
++# output is simply discarded.  So we exec the FD to /dev/null,
++# effectively closing config.log, so it can be properly (re)opened and
++# appended to by config.status.  When coming back to configure, we
++# need to make the FD available again.
++if test "$no_create" != yes; then
++  ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
++  exec 5>/dev/null
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
++  exec 5>>config.log
++  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
++  # would make configure fail if this is the last instruction.
++  $ac_cs_success || { (exit 1); exit 1; }
++fi
++
++
++
++cat > include/newversion.h.in <<EOF
++const char *heimdal_long_version = "@(#)\$Version: $PACKAGE_STRING by @USER@ on @HOST@ ($host) @DATE@ \$";
++const char *heimdal_version = "Heimdal 0.6.3";
++EOF
++
++if test -f include/version.h && cmp -s include/newversion.h.in include/version.h.in; then
++	echo "include/version.h is unchanged"
++	rm -f include/newversion.h.in
++else
++ 	echo "creating include/version.h"
++ 	User=${USER-${LOGNAME}}
++ 	Host=`(hostname || uname -n || echo unknown) 2>/dev/null | sed 1q`
++ 	Date=`date`
++	mv -f include/newversion.h.in include/version.h.in
++	sed -e "s/@USER@/$User/" -e "s/@HOST@/$Host/" -e "s/@DATE@/$Date/" include/version.h.in > include/version.h
++fi
+diff -ruN heimdal-0.6.3-old/autom4te.cache/requests heimdal-0.6.3/autom4te.cache/requests
+--- heimdal-0.6.3-old/autom4te.cache/requests	1970-01-01 10:00:00.000000000 +1000
++++ heimdal-0.6.3/autom4te.cache/requests	2004-09-14 08:39:40.000000000 +1000
+@@ -0,0 +1,117 @@
++# This file was generated by Autom4te Mon Jul 12 13:11:24 PDT 2004.
++# It contains the lists of macros which have been traced.
++# It can be safely removed.
++
++@request = (
++             bless( [
++                      '0',
++                      1,
++                      [
++                        '/usr/share/autoconf'
++                      ],
++                      [
++                        '/usr/share/autoconf/autoconf/autoconf.m4f',
++                        'aclocal.m4',
++                        'configure.in'
++                      ],
++                      {
++                        'm4_pattern_forbid' => 1,
++                        'AC_CONFIG_LIBOBJ_DIR' => 1,
++                        'AC_TYPE_OFF_T' => 1,
++                        'AC_C_VOLATILE' => 1,
++                        'AC_FUNC_CLOSEDIR_VOID' => 1,
++                        'AC_REPLACE_FNMATCH' => 1,
++                        'AC_PROG_LIBTOOL' => 1,
++                        'AC_FUNC_STAT' => 1,
++                        'AC_HEADER_TIME' => 1,
++                        'AC_FUNC_WAIT3' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
++                        'AC_STRUCT_TM' => 1,
++                        'AC_FUNC_LSTAT' => 1,
++                        'AC_TYPE_MODE_T' => 1,
++                        'AC_FUNC_GETMNTENT' => 1,
++                        'AC_FUNC_STRTOD' => 1,
++                        'AC_CHECK_HEADERS' => 1,
++                        'AC_FUNC_STRNLEN' => 1,
++                        'm4_sinclude' => 1,
++                        'AC_PROG_CXX' => 1,
++                        'AC_PATH_X' => 1,
++                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
++                        'AC_PROG_AWK' => 1,
++                        '_m4_warn' => 1,
++                        'AC_HEADER_STDC' => 1,
++                        'AC_HEADER_MAJOR' => 1,
++                        'AC_FUNC_ERROR_AT_LINE' => 1,
++                        'AC_PROG_GCC_TRADITIONAL' => 1,
++                        'AC_LIBSOURCE' => 1,
++                        'AC_FUNC_MBRTOWC' => 1,
++                        'AC_STRUCT_ST_BLOCKS' => 1,
++                        'AC_TYPE_SIGNAL' => 1,
++                        'AC_TYPE_UID_T' => 1,
++                        'AC_PROG_MAKE_SET' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
++                        'sinclude' => 1,
++                        'm4_pattern_allow' => 1,
++                        'AC_DEFINE_TRACE_LITERAL' => 1,
++                        'AC_FUNC_STRERROR_R' => 1,
++                        'AC_PROG_CC' => 1,
++                        'AC_DECL_SYS_SIGLIST' => 1,
++                        'AC_FUNC_FORK' => 1,
++                        'AC_FUNC_VPRINTF' => 1,
++                        'AC_FUNC_STRCOLL' => 1,
++                        'AC_PROG_YACC' => 1,
++                        'AC_STRUCT_TIMEZONE' => 1,
++                        'AC_INIT' => 1,
++                        'AC_FUNC_CHOWN' => 1,
++                        'AC_SUBST' => 1,
++                        'AC_FUNC_ALLOCA' => 1,
++                        'AC_CANONICAL_HOST' => 1,
++                        'AC_FUNC_GETPGRP' => 1,
++                        'AC_PROG_RANLIB' => 1,
++                        'AM_INIT_AUTOMAKE' => 1,
++                        'AC_FUNC_SETPGRP' => 1,
++                        'AC_CONFIG_SUBDIRS' => 1,
++                        'AC_FUNC_MMAP' => 1,
++                        'AC_FUNC_REALLOC' => 1,
++                        'AC_TYPE_SIZE_T' => 1,
++                        'AC_CONFIG_LINKS' => 1,
++                        'AC_CHECK_TYPES' => 1,
++                        'AC_CHECK_MEMBERS' => 1,
++                        'AM_MAINTAINER_MODE' => 1,
++                        'AC_FUNC_UTIME_NULL' => 1,
++                        'AC_FUNC_SELECT_ARGTYPES' => 1,
++                        'AC_FUNC_STRFTIME' => 1,
++                        'AC_HEADER_STAT' => 1,
++                        'AC_C_INLINE' => 1,
++                        'AC_PROG_CPP' => 1,
++                        'AC_TYPE_PID_T' => 1,
++                        'AC_C_CONST' => 1,
++                        'AC_PROG_LEX' => 1,
++                        'AM_ENABLE_MULTILIB' => 1,
++                        'AC_CONFIG_FILES' => 1,
++                        'include' => 1,
++                        'AC_FUNC_SETVBUF_REVERSED' => 1,
++                        'AC_PROG_INSTALL' => 1,
++                        'AM_GNU_GETTEXT' => 1,
++                        'AC_CHECK_LIB' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
++                        'AC_FUNC_MALLOC' => 1,
++                        'AC_FUNC_GETGROUPS' => 1,
++                        'AC_FUNC_GETLOADAVG' => 1,
++                        'AH_OUTPUT' => 1,
++                        'AC_FUNC_FSEEKO' => 1,
++                        'AM_PROG_CC_C_O' => 1,
++                        'AM_CONDITIONAL' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AC_FUNC_MKTIME' => 1,
++                        'AC_CONFIG_HEADERS' => 1,
++                        'AC_HEADER_SYS_WAIT' => 1,
++                        'AC_PROG_LN_S' => 1,
++                        'AC_FUNC_MEMCMP' => 1,
++                        'm4_include' => 1,
++                        'AC_HEADER_DIRENT' => 1,
++                        'AC_CHECK_FUNCS' => 1
++                      }
++                    ], 'Autom4te::Request' )
++           );
++
+diff -ruN heimdal-0.6.3-old/autom4te.cache/traces.0 heimdal-0.6.3/autom4te.cache/traces.0
+--- heimdal-0.6.3-old/autom4te.cache/traces.0	1970-01-01 10:00:00.000000000 +1000
++++ heimdal-0.6.3/autom4te.cache/traces.0	2004-09-14 08:39:13.000000000 +1000
+@@ -0,0 +1,3521 @@
++m4trace:aclocal.m4:152: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
++m4trace:configure.in:5: -1- AC_INIT([Heimdal], [0.6.3], [heimdal-bugs@pdc.kth.se])
++m4trace:configure.in:5: -1- m4_pattern_forbid([^_?A[CHUM]_])
++m4trace:configure.in:5: -1- m4_pattern_forbid([_AC_])
++m4trace:configure.in:5: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
++m4trace:configure.in:5: -1- m4_pattern_allow([^AS_FLAGS$])
++m4trace:configure.in:5: -1- m4_pattern_forbid([^_?m4_])
++m4trace:configure.in:5: -1- m4_pattern_forbid([^dnl$])
++m4trace:configure.in:5: -1- m4_pattern_forbid([^_?AS_])
++m4trace:configure.in:5: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
++m4trace:configure.in:5: -1- AC_SUBST([PATH_SEPARATOR])
++m4trace:configure.in:5: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
++m4trace:configure.in:5: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
++m4trace:configure.in:5: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
++m4trace:configure.in:5: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
++m4trace:configure.in:5: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
++m4trace:configure.in:5: -1- AC_SUBST([exec_prefix], [NONE])
++m4trace:configure.in:5: -1- AC_SUBST([prefix], [NONE])
++m4trace:configure.in:5: -1- AC_SUBST([program_transform_name], [s,x,x,])
++m4trace:configure.in:5: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
++m4trace:configure.in:5: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
++m4trace:configure.in:5: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
++m4trace:configure.in:5: -1- AC_SUBST([datadir], ['${prefix}/share'])
++m4trace:configure.in:5: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
++m4trace:configure.in:5: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
++m4trace:configure.in:5: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
++m4trace:configure.in:5: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
++m4trace:configure.in:5: -1- AC_SUBST([includedir], ['${prefix}/include'])
++m4trace:configure.in:5: -1- AC_SUBST([oldincludedir], ['/usr/include'])
++m4trace:configure.in:5: -1- AC_SUBST([infodir], ['${prefix}/info'])
++m4trace:configure.in:5: -1- AC_SUBST([mandir], ['${prefix}/man'])
++m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
++m4trace:configure.in:5: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
++#undef PACKAGE_NAME])
++m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
++m4trace:configure.in:5: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME])
++m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
++m4trace:configure.in:5: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
++#undef PACKAGE_VERSION])
++m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
++m4trace:configure.in:5: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING])
++m4trace:configure.in:5: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
++m4trace:configure.in:5: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT])
++m4trace:configure.in:5: -1- AC_SUBST([build_alias])
++m4trace:configure.in:5: -1- AC_SUBST([host_alias])
++m4trace:configure.in:5: -1- AC_SUBST([target_alias])
++m4trace:configure.in:5: -1- AC_SUBST([DEFS])
++m4trace:configure.in:5: -1- AC_SUBST([ECHO_C])
++m4trace:configure.in:5: -1- AC_SUBST([ECHO_N])
++m4trace:configure.in:5: -1- AC_SUBST([ECHO_T])
++m4trace:configure.in:5: -1- AC_SUBST([LIBS])
++m4trace:configure.in:6: -1- AM_MAINTAINER_MODE
++m4trace:configure.in:6: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++m4trace:configure.in:6: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
++m4trace:configure.in:6: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
++m4trace:configure.in:6: -1- AC_SUBST([MAINT])
++m4trace:configure.in:8: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
++You should run autoupdate.], [aclocal.m4:121: AM_CONFIG_HEADER is expanded from...
++configure.in:8: the top level])
++m4trace:configure.in:8: -1- AC_CONFIG_HEADERS([include/config.h])
++m4trace:configure.in:11: -1- AC_PROG_CC
++m4trace:configure.in:11: -1- AC_SUBST([CC])
++m4trace:configure.in:11: -1- AC_SUBST([CFLAGS])
++m4trace:configure.in:11: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:11: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:11: -1- AC_SUBST([CC])
++m4trace:configure.in:11: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:11: -1- AC_SUBST([CC])
++m4trace:configure.in:11: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:11: -1- AC_SUBST([CC])
++m4trace:configure.in:11: -1- AC_SUBST([CC])
++m4trace:configure.in:11: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:11: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
++m4trace:configure.in:11: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
++m4trace:configure.in:12: -1- AC_PROG_CPP
++m4trace:configure.in:12: -1- AC_SUBST([CPP])
++m4trace:configure.in:12: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:12: -1- AC_SUBST([CPP])
++m4trace:configure.in:13: -1- _m4_warn([obsolete], [The macro `AC_PROG_CC_STDC' is obsolete.
++You should run autoupdate.], [autoconf/c.m4:870: AC_PROG_CC_STDC is expanded from...
++configure.in:13: the top level])
++m4trace:configure.in:15: -1- AM_INIT_AUTOMAKE([foreign no-dependencies 1.7])
++m4trace:configure.in:15: -1- AM_AUTOMAKE_VERSION([1.7.9])
++m4trace:configure.in:15: -1- AC_PROG_INSTALL
++m4trace:configure.in:15: -1- AC_SUBST([INSTALL_PROGRAM])
++m4trace:configure.in:15: -1- AC_SUBST([INSTALL_SCRIPT])
++m4trace:configure.in:15: -1- AC_SUBST([INSTALL_DATA])
++m4trace:configure.in:15: -1- AC_SUBST([CYGPATH_W])
++m4trace:configure.in:15: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
++m4trace:configure.in:15: -1- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])
++m4trace:configure.in:15: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
++m4trace:configure.in:15: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
++#undef PACKAGE])
++m4trace:configure.in:15: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
++m4trace:configure.in:15: -1- AH_OUTPUT([VERSION], [/* Version number of package */
++#undef VERSION])
++m4trace:configure.in:15: -1- AC_SUBST([ACLOCAL])
++m4trace:configure.in:15: -1- AC_SUBST([AUTOCONF])
++m4trace:configure.in:15: -1- AC_SUBST([AUTOMAKE])
++m4trace:configure.in:15: -1- AC_SUBST([AUTOHEADER])
++m4trace:configure.in:15: -1- AC_SUBST([MAKEINFO])
++m4trace:configure.in:15: -1- AC_SUBST([AMTAR])
++m4trace:configure.in:15: -1- AC_SUBST([install_sh])
++m4trace:configure.in:15: -1- AC_SUBST([STRIP])
++m4trace:configure.in:15: -1- AC_SUBST([ac_ct_STRIP])
++m4trace:configure.in:15: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
++m4trace:configure.in:15: -1- AC_PROG_AWK
++m4trace:configure.in:15: -1- AC_SUBST([AWK])
++m4trace:configure.in:15: -1- AC_PROG_MAKE_SET
++m4trace:configure.in:15: -1- AC_SUBST([SET_MAKE])
++m4trace:configure.in:15: -1- AC_SUBST([am__leading_dot])
++m4trace:configure.in:16: -1- AM_MAINTAINER_MODE
++m4trace:configure.in:16: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++m4trace:configure.in:16: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
++m4trace:configure.in:16: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
++m4trace:configure.in:16: -1- AC_SUBST([MAINT])
++m4trace:configure.in:23: -1- AC_CANONICAL_HOST
++m4trace:configure.in:23: -1- AC_SUBST([build], [$ac_cv_build])
++m4trace:configure.in:23: -1- AC_SUBST([build_cpu], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:23: -1- AC_SUBST([build_vendor], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:23: -1- AC_SUBST([build_os], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:23: -1- AC_SUBST([host], [$ac_cv_host])
++m4trace:configure.in:23: -1- AC_SUBST([host_cpu], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:23: -1- AC_SUBST([host_vendor], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:23: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:25: -1- AC_SUBST([CANONICAL_HOST])
++m4trace:configure.in:27: -1- AC_DEFINE_TRACE_LITERAL([_FILE_OFFSET_BITS])
++m4trace:configure.in:27: -1- AH_OUTPUT([_FILE_OFFSET_BITS], [/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS])
++m4trace:configure.in:27: -1- AC_DEFINE_TRACE_LITERAL([_LARGE_FILES])
++m4trace:configure.in:27: -1- AH_OUTPUT([_LARGE_FILES], [/* Define for large files, on AIX-style hosts. */
++#undef _LARGE_FILES])
++m4trace:configure.in:38: -1- AC_DEFINE_TRACE_LITERAL([_GNU_SOURCE])
++m4trace:configure.in:38: -1- AH_OUTPUT([_GNU_SOURCE], [/* Define to enable extensions on glibc-based systems such as Linux. */
++#undef _GNU_SOURCE])
++m4trace:configure.in:44: -1- AC_PROG_YACC
++m4trace:configure.in:44: -1- AC_SUBST([YACC])
++m4trace:configure.in:45: -1- AC_PROG_LEX
++m4trace:configure.in:45: -1- AC_SUBST([LEX])
++m4trace:configure.in:45: -1- AC_CHECK_LIB([fl], [yywrap], [LEXLIB="-lfl"], [AC_CHECK_LIB(l, yywrap, LEXLIB="-ll")])
++m4trace:configure.in:45: -1- AC_CHECK_LIB([l], [yywrap], [LEXLIB="-ll"])
++m4trace:configure.in:45: -1- AC_SUBST([LEXLIB])
++m4trace:configure.in:45: -1- AC_SUBST([LEX_OUTPUT_ROOT], [$ac_cv_prog_lex_root])
++m4trace:configure.in:45: -1- AC_DEFINE_TRACE_LITERAL([YYTEXT_POINTER])
++m4trace:configure.in:45: -1- AH_OUTPUT([YYTEXT_POINTER], [/* Define to 1 if `lex\' declares `yytext\' as a `char *\' by default, not a
++   `char[]\'. */
++#undef YYTEXT_POINTER])
++m4trace:configure.in:47: -1- AC_PROG_AWK
++m4trace:configure.in:47: -1- AC_SUBST([AWK])
++m4trace:configure.in:48: -1- AC_SUBST([LN_S])
++m4trace:configure.in:50: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:1049: AC_MIPS_ABI is expanded from...
++configure.in:50: the top level])
++m4trace:configure.in:50: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:1049: AC_MIPS_ABI is expanded from...
++configure.in:50: the top level])
++m4trace:configure.in:50: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:1049: AC_MIPS_ABI is expanded from...
++configure.in:50: the top level])
++m4trace:configure.in:54: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:1080: AC_C___ATTRIBUTE__ is expanded from...
++configure.in:54: the top level])
++m4trace:configure.in:54: -1- AC_DEFINE_TRACE_LITERAL([HAVE___ATTRIBUTE__])
++m4trace:configure.in:54: -1- AH_OUTPUT([HAVE___ATTRIBUTE__], [/* define if your compiler has __attribute__ */
++#undef HAVE___ATTRIBUTE__])
++m4trace:configure.in:56: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:2843: AC_ENABLE_SHARED is expanded from...
++configure.in:56: the top level])
++m4trace:configure.in:57: -1- AC_PROG_LIBTOOL
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:2882: AC_ENABLE_STATIC is expanded from...
++configure.in:57: AC_ENABLE_STATIC is required by...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:2921: AC_ENABLE_FAST_INSTALL is expanded from...
++configure.in:57: AC_ENABLE_FAST_INSTALL is required by...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++aclocal.m4:3118: AC_PROG_LD is expanded from...
++configure.in:57: AC_PROG_LD is required by...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- AC_SUBST([EGREP])
++m4trace:configure.in:57: -1- AC_PROG_LN_S
++m4trace:configure.in:57: -1- AC_SUBST([LN_S], [$as_ln_s])
++m4trace:configure.in:57: -1- AC_SUBST([ECHO])
++m4trace:configure.in:57: -1- AC_SUBST([AR])
++m4trace:configure.in:57: -1- AC_SUBST([ac_ct_AR])
++m4trace:configure.in:57: -1- AC_SUBST([RANLIB])
++m4trace:configure.in:57: -1- AC_SUBST([ac_ct_RANLIB])
++m4trace:configure.in:57: -1- AC_SUBST([STRIP])
++m4trace:configure.in:57: -1- AC_SUBST([ac_ct_STRIP])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:1620: _LT_AC_LOCK is expanded from...
++configure.in:57: _LT_AC_LOCK is required by...
++aclocal.m4:2051: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
++aclocal.m4:3665: _LT_AC_LANG_C_CONFIG is expanded from...
++aclocal.m4:3532: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- AC_CHECK_HEADERS([dlfcn.h])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H])
++m4trace:configure.in:57: -1- AC_HEADER_STDC
++m4trace:configure.in:57: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
++m4trace:configure.in:57: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS])
++m4trace:configure.in:57: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H])
++m4trace:configure.in:57: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- AC_PROG_CXX
++m4trace:configure.in:57: -1- AC_SUBST([CXX])
++m4trace:configure.in:57: -1- AC_SUBST([CXXFLAGS])
++m4trace:configure.in:57: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:57: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:57: -1- AC_SUBST([CXX])
++m4trace:configure.in:57: -1- AC_SUBST([ac_ct_CXX])
++m4trace:configure.in:57: -1- AC_SUBST([CXXCPP])
++m4trace:configure.in:57: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:57: -1- AC_SUBST([CXXCPP])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:57: -1- AC_SUBST([F77])
++m4trace:configure.in:57: -1- AC_SUBST([FFLAGS])
++m4trace:configure.in:57: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:57: -1- AC_SUBST([F77])
++m4trace:configure.in:57: -1- AC_SUBST([ac_ct_F77])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:4842: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:4799: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
++and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:4842: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:4799: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:57: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
++aclocal.m4:4842: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:4799: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:4881: _LT_AC_LANG_RC_CONFIG is expanded from...
++aclocal.m4:4850: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
++and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:4881: _LT_AC_LANG_RC_CONFIG is expanded from...
++aclocal.m4:4850: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
++aclocal.m4:4881: _LT_AC_LANG_RC_CONFIG is expanded from...
++aclocal.m4:4850: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++aclocal.m4:2797: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:1293: AC_LIBTOOL_SETUP is expanded from...
++configure.in:57: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:1151: _AC_PROG_LIBTOOL is expanded from...
++configure.in:57: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:1131: AC_PROG_LIBTOOL is expanded from...
++configure.in:57: the top level])
++m4trace:configure.in:57: -1- AC_SUBST([LIBTOOL])
++m4trace:configure.in:59: -1- AC_SUBST([WFLAGS])
++m4trace:configure.in:59: -1- AC_SUBST([WFLAGS_NOUNUSED])
++m4trace:configure.in:59: -1- AC_SUBST([WFLAGS_NOIMPLICITINT])
++m4trace:configure.in:64: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:64: the top level])
++m4trace:configure.in:64: -1- AC_DEFINE_TRACE_LITERAL([OPENLDAP])
++m4trace:configure.in:64: -1- AH_OUTPUT([OPENLDAP], [/* Define if you have the openldap package. */
++#undef OPENLDAP])
++m4trace:configure.in:64: -1- AC_SUBST([DIR_openldap])
++m4trace:configure.in:64: -1- AC_SUBST([INCLUDE_openldap])
++m4trace:configure.in:64: -1- AC_SUBST([LIB_openldap])
++m4trace:configure.in:66: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:66: -1- AC_DEFINE_TRACE_LITERAL([KRB4])
++m4trace:configure.in:66: -1- AH_OUTPUT([KRB4], [/* Define if you have the krb4 package. */
++#undef KRB4])
++m4trace:configure.in:66: -1- AC_SUBST([DIR_krb4])
++m4trace:configure.in:66: -1- AC_SUBST([INCLUDE_krb4])
++m4trace:configure.in:66: -1- AC_SUBST([LIB_krb4])
++m4trace:configure.in:75: -1- AC_SUBST([EXTRA_LIB45])
++m4trace:configure.in:82: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++configure.in:82: the top level])
++m4trace:configure.in:85: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FOUR_VALUED_KRB_PUT_INT])
++m4trace:configure.in:85: -1- AH_OUTPUT([HAVE_FOUR_VALUED_KRB_PUT_INT], [/* define if krb_put_int takes four arguments. */
++#undef HAVE_FOUR_VALUED_KRB_PUT_INT])
++m4trace:configure.in:92: -1- AH_OUTPUT([zzzz1], [#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
++])
++m4trace:configure.in:98: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++configure.in:98: the top level])
++m4trace:configure.in:101: -1- AC_DEFINE_TRACE_LITERAL([KRB_VERIFY_SECURE])
++m4trace:configure.in:101: -1- AH_OUTPUT([KRB_VERIFY_SECURE], [/* Define to one if your krb.h doesn\'t */
++#undef KRB_VERIFY_SECURE])
++m4trace:configure.in:103: -1- AC_DEFINE_TRACE_LITERAL([KRB_VERIFY_SECURE_FAIL])
++m4trace:configure.in:103: -1- AH_OUTPUT([KRB_VERIFY_SECURE_FAIL], [/* Define to two if your krb.h doesn\'t */
++#undef KRB_VERIFY_SECURE_FAIL])
++m4trace:configure.in:111: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++configure.in:111: the top level])
++m4trace:configure.in:114: -1- AC_DEFINE_TRACE_LITERAL([KRB_VERIFY_NOT_SECURE])
++m4trace:configure.in:114: -1- AH_OUTPUT([KRB_VERIFY_NOT_SECURE], [/* Define to zero if your krb.h doesn\'t */
++#undef KRB_VERIFY_NOT_SECURE])
++m4trace:configure.in:116: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++configure.in:116: the top level])
++m4trace:configure.in:116: -1- AC_CHECK_FUNCS([krb_enable_debug])
++m4trace:configure.in:116: -1- AH_OUTPUT([HAVE_KRB_ENABLE_DEBUG], [/* Define to 1 if you have the `krb_enable_debug\' function. */
++#undef HAVE_KRB_ENABLE_DEBUG])
++m4trace:configure.in:116: -1- AC_SUBST([LIB_krb_enable_debug])
++m4trace:configure.in:117: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++configure.in:117: the top level])
++m4trace:configure.in:117: -1- AC_CHECK_FUNCS([krb_disable_debug])
++m4trace:configure.in:117: -1- AH_OUTPUT([HAVE_KRB_DISABLE_DEBUG], [/* Define to 1 if you have the `krb_disable_debug\' function. */
++#undef HAVE_KRB_DISABLE_DEBUG])
++m4trace:configure.in:117: -1- AC_SUBST([LIB_krb_disable_debug])
++m4trace:configure.in:118: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++configure.in:118: the top level])
++m4trace:configure.in:118: -1- AC_CHECK_FUNCS([krb_get_our_ip_for_realm])
++m4trace:configure.in:118: -1- AH_OUTPUT([HAVE_KRB_GET_OUR_IP_FOR_REALM], [/* Define to 1 if you have the `krb_get_our_ip_for_realm\' function. */
++#undef HAVE_KRB_GET_OUR_IP_FOR_REALM])
++m4trace:configure.in:118: -1- AC_SUBST([LIB_krb_get_our_ip_for_realm])
++m4trace:configure.in:119: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++configure.in:119: the top level])
++m4trace:configure.in:119: -1- AC_CHECK_FUNCS([krb_kdctimeofday])
++m4trace:configure.in:119: -1- AH_OUTPUT([HAVE_KRB_KDCTIMEOFDAY], [/* Define to 1 if you have the `krb_kdctimeofday\' function. */
++#undef HAVE_KRB_KDCTIMEOFDAY])
++m4trace:configure.in:119: -1- AC_SUBST([LIB_krb_kdctimeofday])
++m4trace:configure.in:123: -1- AH_OUTPUT([zzzz2], [#ifndef HAVE_KRB_KDCTIMEOFDAY
++#define krb_kdctimeofday(X) gettimeofday((X), NULL)
++#endif])
++m4trace:configure.in:124: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++configure.in:124: the top level])
++m4trace:configure.in:124: -1- AC_CHECK_FUNCS([krb_get_kdc_time_diff])
++m4trace:configure.in:124: -1- AH_OUTPUT([HAVE_KRB_GET_KDC_TIME_DIFF], [/* Define to 1 if you have the `krb_get_kdc_time_diff\' function. */
++#undef HAVE_KRB_GET_KDC_TIME_DIFF])
++m4trace:configure.in:124: -1- AC_SUBST([LIB_krb_get_kdc_time_diff])
++m4trace:configure.in:128: -1- AH_OUTPUT([zzzz3], [#ifndef HAVE_KRB_GET_KDC_TIME_DIFF
++#define krb_get_kdc_time_diff() (0)
++#endif])
++m4trace:configure.in:136: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++configure.in:136: the top level])
++m4trace:configure.in:139: -1- AC_DEFINE_TRACE_LITERAL([KRB_SENDAUTH_VERS])
++m4trace:configure.in:139: -1- AH_OUTPUT([KRB_SENDAUTH_VERS], [/* This is the krb4 sendauth version. */
++#undef KRB_SENDAUTH_VERS])
++m4trace:configure.in:149: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++configure.in:149: the top level])
++m4trace:configure.in:152: -1- AC_DEFINE_TRACE_LITERAL([KRB_MK_REQ_CONST])
++m4trace:configure.in:152: -1- AH_OUTPUT([KRB_MK_REQ_CONST], [/* Define if krb_mk_req takes const char * */
++#undef KRB_MK_REQ_CONST])
++m4trace:configure.in:159: -1- AM_CONDITIONAL([KRB4], [test "$with_krb4" != "no"])
++m4trace:configure.in:159: -1- AC_SUBST([KRB4_TRUE])
++m4trace:configure.in:159: -1- AC_SUBST([KRB4_FALSE])
++m4trace:configure.in:160: -1- AM_CONDITIONAL([KRB5], [true])
++m4trace:configure.in:160: -1- AC_SUBST([KRB5_TRUE])
++m4trace:configure.in:160: -1- AC_SUBST([KRB5_FALSE])
++m4trace:configure.in:161: -1- AM_CONDITIONAL([do_roken_rename], [true])
++m4trace:configure.in:161: -1- AC_SUBST([do_roken_rename_TRUE])
++m4trace:configure.in:161: -1- AC_SUBST([do_roken_rename_FALSE])
++m4trace:configure.in:163: -1- AC_DEFINE_TRACE_LITERAL([KRB5])
++m4trace:configure.in:163: -1- AH_OUTPUT([KRB5], [/* Enable Kerberos 5 support in applications. */
++#undef KRB5])
++m4trace:configure.in:164: -1- AC_SUBST([LIB_kdb])
++m4trace:configure.in:166: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7476: AC_WITH_ALL is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7476: AC_WITH_ALL is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7476: AC_WITH_ALL is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7433: KRB_CRYPTO is expanded from...
++configure.in:166: the top level])
++m4trace:configure.in:166: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPENSSL])
++m4trace:configure.in:166: -1- AH_OUTPUT([HAVE_OPENSSL], [/* define to use openssl\'s libcrypto */
++#undef HAVE_OPENSSL])
++m4trace:configure.in:166: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OLD_HASH_NAMES])
++m4trace:configure.in:166: -1- AH_OUTPUT([HAVE_OLD_HASH_NAMES], [/* define if you have hash functions like md4_finito() */
++#undef HAVE_OLD_HASH_NAMES])
++m4trace:configure.in:166: -1- AM_CONDITIONAL([HAVE_OPENSSL], [test "$openssl" = yes])
++m4trace:configure.in:166: -1- AC_SUBST([HAVE_OPENSSL_TRUE])
++m4trace:configure.in:166: -1- AC_SUBST([HAVE_OPENSSL_FALSE])
++m4trace:configure.in:166: -1- AC_SUBST([DIR_des])
++m4trace:configure.in:166: -1- AC_SUBST([INCLUDE_des])
++m4trace:configure.in:166: -1- AC_SUBST([LIB_des])
++m4trace:configure.in:166: -1- AC_SUBST([LIB_des_a])
++m4trace:configure.in:166: -1- AC_SUBST([LIB_des_so])
++m4trace:configure.in:166: -1- AC_SUBST([LIB_des_appl])
++m4trace:configure.in:169: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++configure.in:169: the top level])
++m4trace:configure.in:171: -1- AC_DEFINE_TRACE_LITERAL([DCE])
++m4trace:configure.in:171: -1- AH_OUTPUT([DCE], [/* Define if you want support for DCE/DFS PAG\'s. */
++#undef DCE])
++m4trace:configure.in:173: -1- AM_CONDITIONAL([DCE], [test "$enable_dce" = yes])
++m4trace:configure.in:173: -1- AC_SUBST([DCE_TRUE])
++m4trace:configure.in:173: -1- AC_SUBST([DCE_FALSE])
++m4trace:configure.in:185: -1- AC_SUBST([dpagaix_cflags])
++m4trace:configure.in:186: -1- AC_SUBST([dpagaix_ldadd])
++m4trace:configure.in:187: -1- AC_SUBST([dpagaix_ldflags])
++m4trace:configure.in:189: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_CHECK_HEADERS([				\
++	db4/db.h				\
++	db3/db.h				\
++	db.h					\
++	db_185.h				\
++  ])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB4_DB_H], [/* Define to 1 if you have the <db4/db.h> header file. */
++#undef HAVE_DB4_DB_H])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB3_DB_H], [/* Define to 1 if you have the <db3/db.h> header file. */
++#undef HAVE_DB3_DB_H])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
++#undef HAVE_DB_H])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB_185_H], [/* Define to 1 if you have the <db_185.h> header file. */
++#undef HAVE_DB_185_H])
++m4trace:configure.in:189: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_CHECK_FUNCS([db_create])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB_CREATE], [/* Define to 1 if you have the `db_create\' function. */
++#undef HAVE_DB_CREATE])
++m4trace:configure.in:189: -1- AC_SUBST([LIB_db_create])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DB3])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB3], [/* define if you have a berkeley db3/4 library */
++#undef HAVE_DB3])
++m4trace:configure.in:189: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_CHECK_FUNCS([dbopen])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DBOPEN], [/* Define to 1 if you have the `dbopen\' function. */
++#undef HAVE_DBOPEN])
++m4trace:configure.in:189: -1- AC_SUBST([LIB_dbopen])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DB1])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB1], [/* define if you have a berkeley db1/2 library */
++#undef HAVE_DB1])
++m4trace:configure.in:189: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_CHECK_FUNCS([dbm_firstkey])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DBM_FIRSTKEY], [/* Define to 1 if you have the `dbm_firstkey\' function. */
++#undef HAVE_DBM_FIRSTKEY])
++m4trace:configure.in:189: -1- AC_SUBST([LIB_dbm_firstkey])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DB_NDBM])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DB_NDBM], [/* define if you have ndbm compat in db */
++#undef HAVE_DB_NDBM])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NEW_DB])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_NEW_DB], [/* Define if NDBM really is DB (creates files *.db) */
++#undef HAVE_NEW_DB])
++m4trace:configure.in:189: -1- AC_CHECK_HEADERS([				\
++	dbm.h					\
++	ndbm.h					\
++  ])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DBM_H], [/* Define to 1 if you have the <dbm.h> header file. */
++#undef HAVE_DBM_H])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_NDBM_H], [/* Define to 1 if you have the <ndbm.h> header file. */
++#undef HAVE_NDBM_H])
++m4trace:configure.in:189: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_CHECK_FUNCS([dbm_firstkey])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DBM_FIRSTKEY], [/* Define to 1 if you have the `dbm_firstkey\' function. */
++#undef HAVE_DBM_FIRSTKEY])
++m4trace:configure.in:189: -1- AC_SUBST([LIB_dbm_firstkey])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NDBM])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_NDBM], [/* define if you have a ndbm library */
++#undef HAVE_NDBM])
++m4trace:configure.in:189: -1- AC_CHECK_HEADERS([				\
++	  gdbm/ndbm.h				\
++    ])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_GDBM_NDBM_H], [/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
++#undef HAVE_GDBM_NDBM_H])
++m4trace:configure.in:189: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_CHECK_FUNCS([dbm_firstkey])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_DBM_FIRSTKEY], [/* Define to 1 if you have the `dbm_firstkey\' function. */
++#undef HAVE_DBM_FIRSTKEY])
++m4trace:configure.in:189: -1- AC_SUBST([LIB_dbm_firstkey])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NDBM])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_NDBM], [/* define if you have a ndbm library */
++#undef HAVE_NDBM])
++m4trace:configure.in:189: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:7678: rk_DB is expanded from...
++configure.in:189: the top level])
++m4trace:configure.in:189: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NEW_DB])
++m4trace:configure.in:189: -1- AH_OUTPUT([HAVE_NEW_DB], [/* Define if NDBM really is DB (creates files *.db) */
++#undef HAVE_NEW_DB])
++m4trace:configure.in:189: -1- AM_CONDITIONAL([HAVE_DB1], [test "$db_type" = db1])
++m4trace:configure.in:189: -1- AC_SUBST([HAVE_DB1_TRUE])
++m4trace:configure.in:189: -1- AC_SUBST([HAVE_DB1_FALSE])
++m4trace:configure.in:189: -1- AM_CONDITIONAL([HAVE_DB3], [test "$db_type" = db3])
++m4trace:configure.in:189: -1- AC_SUBST([HAVE_DB3_TRUE])
++m4trace:configure.in:189: -1- AC_SUBST([HAVE_DB3_FALSE])
++m4trace:configure.in:189: -1- AM_CONDITIONAL([HAVE_NDBM], [test "$db_type" = ndbm])
++m4trace:configure.in:189: -1- AC_SUBST([HAVE_NDBM_TRUE])
++m4trace:configure.in:189: -1- AC_SUBST([HAVE_NDBM_FALSE])
++m4trace:configure.in:189: -1- AC_SUBST([DBLIB])
++m4trace:configure.in:189: -1- AC_SUBST([LIB_NDBM])
++m4trace:configure.in:191: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7744: AC_ROKEN is expanded from...
++configure.in:191: the top level])
++m4trace:configure.in:191: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++aclocal.m4:7744: AC_ROKEN is expanded from...
++configure.in:191: the top level])
++m4trace:configure.in:191: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7744: AC_ROKEN is expanded from...
++configure.in:191: the top level])
++m4trace:configure.in:191: -1- AC_CHECK_FUNCS([crypt])
++m4trace:configure.in:191: -1- AH_OUTPUT([HAVE_CRYPT], [/* Define to 1 if you have the `crypt\' function. */
++#undef HAVE_CRYPT])
++m4trace:configure.in:191: -1- AC_SUBST([LIB_crypt])
++m4trace:configure.in:191: -1- AC_SUBST([LIB_roken])
++m4trace:configure.in:191: -1- AC_SUBST([DIR_roken])
++m4trace:configure.in:191: -1- AC_SUBST([CPPFLAGS_roken])
++m4trace:configure.in:193: -1- AH_OUTPUT([00004], [#ifndef RCSID
++#define RCSID(msg) \\
++static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
++#endif
++
++/* Maximum values on all known systems */
++#define MaxHostNameLen (64+4)
++#define MaxPathLen (1024+4)
++
++])
++m4trace:configure.in:193: -1- AC_C_INLINE
++m4trace:configure.in:193: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
++   calls it, or to nothing if \'inline\' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif])
++m4trace:configure.in:193: -1- AC_C_CONST
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([const])
++m4trace:configure.in:193: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
++#undef const])
++m4trace:configure.in:193: -1- AC_SUBST([WFLAGS])
++m4trace:configure.in:193: -1- AC_SUBST([WFLAGS_NOUNUSED])
++m4trace:configure.in:193: -1- AC_SUBST([WFLAGS_NOIMPLICITINT])
++m4trace:configure.in:193: -1- AC_TYPE_SIZE_T
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([size_t])
++m4trace:configure.in:193: -1- AH_OUTPUT([size_t], [/* Define to `unsigned\' if <sys/types.h> does not define. */
++#undef size_t])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([ssize_t])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SSIZE_T])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SSIZE_T], [/* Define to 1 if the system has the type `ssize_t\'. */
++#undef HAVE_SSIZE_T])
++m4trace:configure.in:193: -1- AC_TYPE_PID_T
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
++m4trace:configure.in:193: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
++#undef pid_t])
++m4trace:configure.in:193: -1- AC_TYPE_UID_T
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
++m4trace:configure.in:193: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
++#undef uid_t])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
++m4trace:configure.in:193: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
++#undef gid_t])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([long long])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LONG_LONG])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_LONG_LONG], [/* Define to 1 if the system has the type `long long\'. */
++#undef HAVE_LONG_LONG])
++m4trace:configure.in:193: -1- AC_TYPE_SIGNAL
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
++m4trace:configure.in:193: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
++#undef RETSIGTYPE])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([VOID_RETSIGTYPE])
++m4trace:configure.in:193: -1- AH_OUTPUT([VOID_RETSIGTYPE], [/* Define if signal handlers return void. */
++#undef VOID_RETSIGTYPE])
++m4trace:configure.in:193: -1- AC_SUBST([VOID_RETSIGTYPE])
++m4trace:configure.in:193: -1- AH_OUTPUT([zzzz5], [#ifdef VOID_RETSIGTYPE
++#define SIGRETURN(x) return
++#else
++#define SIGRETURN(x) return (RETSIGTYPE)(x)
++#endif])
++m4trace:configure.in:193: -1- AC_HEADER_TIME
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
++m4trace:configure.in:193: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#undef TIME_WITH_SYS_TIME])
++m4trace:configure.in:193: -1- AC_CHECK_HEADERS([\
++	arpa/inet.h				\
++	arpa/nameser.h				\
++	config.h				\
++	crypt.h					\
++	dirent.h				\
++	errno.h					\
++	err.h					\
++	fcntl.h					\
++	grp.h					\
++	ifaddrs.h				\
++	net/if.h				\
++	netdb.h					\
++	netinet/in.h				\
++	netinet/in6.h				\
++	netinet/in_systm.h			\
++	netinet6/in6.h				\
++	netinet6/in6_var.h			\
++	paths.h					\
++	pwd.h					\
++	resolv.h				\
++	rpcsvc/ypclnt.h				\
++	shadow.h				\
++	sys/bswap.h				\
++	sys/ioctl.h				\
++	sys/mman.h				\
++	sys/param.h				\
++	sys/proc.h				\
++	sys/resource.h				\
++	sys/socket.h				\
++	sys/sockio.h				\
++	sys/stat.h				\
++	sys/sysctl.h				\
++	sys/time.h				\
++	sys/tty.h				\
++	sys/types.h				\
++	sys/uio.h				\
++	sys/utsname.h				\
++	sys/wait.h				\
++	syslog.h				\
++	termios.h				\
++	unistd.h				\
++	userconf.h				\
++	usersec.h				\
++	util.h					\
++	vis.h					\
++])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ARPA_INET_H], [/* Define to 1 if you have the <arpa/inet.h> header file. */
++#undef HAVE_ARPA_INET_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ARPA_NAMESER_H], [/* Define to 1 if you have the <arpa/nameser.h> header file. */
++#undef HAVE_ARPA_NAMESER_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_CONFIG_H], [/* Define to 1 if you have the <config.h> header file. */
++#undef HAVE_CONFIG_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_CRYPT_H], [/* Define to 1 if you have the <crypt.h> header file. */
++#undef HAVE_CRYPT_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file. */
++#undef HAVE_DIRENT_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
++#undef HAVE_ERRNO_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ERR_H], [/* Define to 1 if you have the <err.h> header file. */
++#undef HAVE_ERR_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
++#undef HAVE_FCNTL_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GRP_H], [/* Define to 1 if you have the <grp.h> header file. */
++#undef HAVE_GRP_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_IFADDRS_H], [/* Define to 1 if you have the <ifaddrs.h> header file. */
++#undef HAVE_IFADDRS_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NET_IF_H], [/* Define to 1 if you have the <net/if.h> header file. */
++#undef HAVE_NET_IF_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
++#undef HAVE_NETDB_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET_IN_H], [/* Define to 1 if you have the <netinet/in.h> header file. */
++#undef HAVE_NETINET_IN_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET_IN6_H], [/* Define to 1 if you have the <netinet/in6.h> header file. */
++#undef HAVE_NETINET_IN6_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET_IN_SYSTM_H], [/* Define to 1 if you have the <netinet/in_systm.h> header file. */
++#undef HAVE_NETINET_IN_SYSTM_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET6_IN6_H], [/* Define to 1 if you have the <netinet6/in6.h> header file. */
++#undef HAVE_NETINET6_IN6_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET6_IN6_VAR_H], [/* Define to 1 if you have the <netinet6/in6_var.h> header file. */
++#undef HAVE_NETINET6_IN6_VAR_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_PATHS_H], [/* Define to 1 if you have the <paths.h> header file. */
++#undef HAVE_PATHS_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
++#undef HAVE_PWD_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RESOLV_H], [/* Define to 1 if you have the <resolv.h> header file. */
++#undef HAVE_RESOLV_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RPCSVC_YPCLNT_H], [/* Define to 1 if you have the <rpcsvc/ypclnt.h> header file. */
++#undef HAVE_RPCSVC_YPCLNT_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SHADOW_H], [/* Define to 1 if you have the <shadow.h> header file. */
++#undef HAVE_SHADOW_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_BSWAP_H], [/* Define to 1 if you have the <sys/bswap.h> header file. */
++#undef HAVE_SYS_BSWAP_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_IOCTL_H], [/* Define to 1 if you have the <sys/ioctl.h> header file. */
++#undef HAVE_SYS_IOCTL_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_MMAN_H], [/* Define to 1 if you have the <sys/mman.h> header file. */
++#undef HAVE_SYS_MMAN_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
++#undef HAVE_SYS_PARAM_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_PROC_H], [/* Define to 1 if you have the <sys/proc.h> header file. */
++#undef HAVE_SYS_PROC_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_RESOURCE_H], [/* Define to 1 if you have the <sys/resource.h> header file. */
++#undef HAVE_SYS_RESOURCE_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
++#undef HAVE_SYS_SOCKET_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_SOCKIO_H], [/* Define to 1 if you have the <sys/sockio.h> header file. */
++#undef HAVE_SYS_SOCKIO_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_SYSCTL_H], [/* Define to 1 if you have the <sys/sysctl.h> header file. */
++#undef HAVE_SYS_SYSCTL_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_TTY_H], [/* Define to 1 if you have the <sys/tty.h> header file. */
++#undef HAVE_SYS_TTY_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
++#undef HAVE_SYS_UIO_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_UTSNAME_H], [/* Define to 1 if you have the <sys/utsname.h> header file. */
++#undef HAVE_SYS_UTSNAME_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have the <sys/wait.h> header file. */
++#undef HAVE_SYS_WAIT_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
++#undef HAVE_SYSLOG_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_TERMIOS_H], [/* Define to 1 if you have the <termios.h> header file. */
++#undef HAVE_TERMIOS_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_USERCONF_H], [/* Define to 1 if you have the <userconf.h> header file. */
++#undef HAVE_USERCONF_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_USERSEC_H], [/* Define to 1 if you have the <usersec.h> header file. */
++#undef HAVE_USERSEC_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_UTIL_H], [/* Define to 1 if you have the <util.h> header file. */
++#undef HAVE_UTIL_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VIS_H], [/* Define to 1 if you have the <vis.h> header file. */
++#undef HAVE_VIS_H])
++m4trace:configure.in:193: -1- AC_CHECK_HEADERS([standards.h])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STANDARDS_H], [/* Define to 1 if you have the <standards.h> header file. */
++#undef HAVE_STANDARDS_H])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_CPP' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2107: AC_TRY_CPP is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8479: CHECK_NETINET_IP_AND_TCP is expanded from...
++configure.in:193: CHECK_NETINET_IP_AND_TCP is required by...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_HEADERS([netinet/ip.h netinet/tcp.h])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET_IP_H], [/* Define to 1 if you have the <netinet/ip.h> header file. */
++#undef HAVE_NETINET_IP_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_NETINET_TCP_H], [/* Define to 1 if you have the <netinet/tcp.h> header file. */
++#undef HAVE_NETINET_TCP_H])
++m4trace:configure.in:193: -1- AM_CONDITIONAL([have_err_h], [test "$ac_cv_header_err_h" = yes])
++m4trace:configure.in:193: -1- AC_SUBST([have_err_h_TRUE])
++m4trace:configure.in:193: -1- AC_SUBST([have_err_h_FALSE])
++m4trace:configure.in:193: -1- AM_CONDITIONAL([have_fnmatch_h], [test "$ac_cv_header_fnmatch_h" = yes])
++m4trace:configure.in:193: -1- AC_SUBST([have_fnmatch_h_TRUE])
++m4trace:configure.in:193: -1- AC_SUBST([have_fnmatch_h_FALSE])
++m4trace:configure.in:193: -1- AM_CONDITIONAL([have_ifaddrs_h], [test "$ac_cv_header_ifaddrs_h" = yes])
++m4trace:configure.in:193: -1- AC_SUBST([have_ifaddrs_h_TRUE])
++m4trace:configure.in:193: -1- AC_SUBST([have_ifaddrs_h_FALSE])
++m4trace:configure.in:193: -1- AM_CONDITIONAL([have_vis_h], [test "$ac_cv_header_vis_h" = yes])
++m4trace:configure.in:193: -1- AC_SUBST([have_vis_h_TRUE])
++m4trace:configure.in:193: -1- AC_SUBST([have_vis_h_FALSE])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([socket])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SOCKET], [/* Define to 1 if you have the `socket\' function. */
++#undef HAVE_SOCKET])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_socket])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([gethostbyname])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETHOSTBYNAME], [/* Define to 1 if you have the `gethostbyname\' function. */
++#undef HAVE_GETHOSTBYNAME])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_gethostbyname])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([syslog])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define to 1 if you have the `syslog\' function. */
++#undef HAVE_SYSLOG])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_syslog])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:8628: AC_KRB_IPV6 is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8628: AC_KRB_IPV6 is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_IPV6])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_IPV6], [/* Define if you have IPv6. */
++#undef HAVE_IPV6])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8628: AC_KRB_IPV6 is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_IN6ADDR_LOOPBACK])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_IN6ADDR_LOOPBACK], [/* Define if you have the in6addr_loopback variable */
++#undef HAVE_IN6ADDR_LOOPBACK])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([gethostbyname2])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETHOSTBYNAME2], [/* Define to 1 if you have the `gethostbyname2\' function. */
++#undef HAVE_GETHOSTBYNAME2])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_gethostbyname2])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([res_search])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RES_SEARCH], [/* Define to 1 if you have the `res_search\' function. */
++#undef HAVE_RES_SEARCH])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_res_search])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([res_nsearch])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RES_NSEARCH], [/* Define to 1 if you have the `res_nsearch\' function. */
++#undef HAVE_RES_NSEARCH])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_res_nsearch])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([dn_expand])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_DN_EXPAND], [/* Define to 1 if you have the `dn_expand\' function. */
++#undef HAVE_DN_EXPAND])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_dn_expand])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE__RES])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE__RES], [/* Define if you have the `_res\' variable. */
++#undef HAVE__RES])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE__RES_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE__RES_DECLARATION], [/* define if your system declares _res */
++#undef HAVE__RES_DECLARATION])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:8706: AC_BROKEN_SNPRINTF is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SNPRINTF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* define if you have a working snprintf */
++#undef HAVE_SNPRINTF])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8706: AC_BROKEN_SNPRINTF is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_SNPRINTF_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_SNPRINTF_PROTO], [/* define if the system is missing a prototype for snprintf() */
++#undef NEED_SNPRINTF_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:8738: AC_BROKEN_VSNPRINTF is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VSNPRINTF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* define if you have a working vsnprintf */
++#undef HAVE_VSNPRINTF])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8738: AC_BROKEN_VSNPRINTF is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_VSNPRINTF_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_VSNPRINTF_PROTO], [/* define if the system is missing a prototype for vsnprintf() */
++#undef NEED_VSNPRINTF_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:8793: AC_BROKEN_GLOB is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GLOB])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GLOB], [/* define if you have a glob() that groks GLOB_BRACE, GLOB_NOCHECK,
++   GLOB_QUOTE, GLOB_TILDE, and GLOB_LIMIT */
++#undef HAVE_GLOB])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8793: AC_BROKEN_GLOB is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_GLOB_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_GLOB_PROTO], [/* define if the system is missing a prototype for glob() */
++#undef NEED_GLOB_PROTO])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([glob.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AM_CONDITIONAL([have_glob_h], [test "$ac_cv_func_glob_working" = yes])
++m4trace:configure.in:193: -1- AC_SUBST([have_glob_h_TRUE])
++m4trace:configure.in:193: -1- AC_SUBST([have_glob_h_FALSE])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([				\
++	asnprintf				\
++	asprintf				\
++	atexit					\
++	cgetent					\
++	getconfattr				\
++	getprogname				\
++	getrlimit				\
++	getspnam				\
++	initstate				\
++	issetugid				\
++	on_exit					\
++	random					\
++	setprogname				\
++	setstate				\
++	strsvis					\
++	strunvis				\
++	strvis					\
++	strvisx					\
++	svis					\
++	sysconf					\
++	sysctl					\
++	uname					\
++	unvis					\
++	vasnprintf				\
++	vasprintf				\
++	vis					\
++])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ASNPRINTF], [/* Define to 1 if you have the `asnprintf\' function. */
++#undef HAVE_ASNPRINTF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ASPRINTF], [/* Define to 1 if you have the `asprintf\' function. */
++#undef HAVE_ASPRINTF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ATEXIT], [/* Define to 1 if you have the `atexit\' function. */
++#undef HAVE_ATEXIT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_CGETENT], [/* Define to 1 if you have the `cgetent\' function. */
++#undef HAVE_CGETENT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETCONFATTR], [/* Define to 1 if you have the `getconfattr\' function. */
++#undef HAVE_GETCONFATTR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETPROGNAME], [/* Define to 1 if you have the `getprogname\' function. */
++#undef HAVE_GETPROGNAME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETRLIMIT], [/* Define to 1 if you have the `getrlimit\' function. */
++#undef HAVE_GETRLIMIT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETSPNAM], [/* Define to 1 if you have the `getspnam\' function. */
++#undef HAVE_GETSPNAM])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_INITSTATE], [/* Define to 1 if you have the `initstate\' function. */
++#undef HAVE_INITSTATE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ISSETUGID], [/* Define to 1 if you have the `issetugid\' function. */
++#undef HAVE_ISSETUGID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ON_EXIT], [/* Define to 1 if you have the `on_exit\' function. */
++#undef HAVE_ON_EXIT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RANDOM], [/* Define to 1 if you have the `random\' function. */
++#undef HAVE_RANDOM])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETPROGNAME], [/* Define to 1 if you have the `setprogname\' function. */
++#undef HAVE_SETPROGNAME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETSTATE], [/* Define to 1 if you have the `setstate\' function. */
++#undef HAVE_SETSTATE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRSVIS], [/* Define to 1 if you have the `strsvis\' function. */
++#undef HAVE_STRSVIS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUNVIS], [/* Define to 1 if you have the `strunvis\' function. */
++#undef HAVE_STRUNVIS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRVIS], [/* Define to 1 if you have the `strvis\' function. */
++#undef HAVE_STRVIS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRVISX], [/* Define to 1 if you have the `strvisx\' function. */
++#undef HAVE_STRVISX])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SVIS], [/* Define to 1 if you have the `svis\' function. */
++#undef HAVE_SVIS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYSCONF], [/* Define to 1 if you have the `sysconf\' function. */
++#undef HAVE_SYSCONF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SYSCTL], [/* Define to 1 if you have the `sysctl\' function. */
++#undef HAVE_SYSCTL])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
++#undef HAVE_UNAME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_UNVIS], [/* Define to 1 if you have the `unvis\' function. */
++#undef HAVE_UNVIS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VASNPRINTF], [/* Define to 1 if you have the `vasnprintf\' function. */
++#undef HAVE_VASNPRINTF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VASPRINTF], [/* Define to 1 if you have the `vasprintf\' function. */
++#undef HAVE_VASPRINTF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VIS], [/* Define to 1 if you have the `vis\' function. */
++#undef HAVE_VIS])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getcap.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([getlogin setlogin])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETLOGIN], [/* Define to 1 if you have the `getlogin\' function. */
++#undef HAVE_GETLOGIN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETLOGIN], [/* Define to 1 if you have the `setlogin\' function. */
++#undef HAVE_SETLOGIN])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([POSIX_GETLOGIN])
++m4trace:configure.in:193: -1- AH_OUTPUT([POSIX_GETLOGIN], [/* Define if getlogin has POSIX flavour (and not BSD). */
++#undef POSIX_GETLOGIN])
++m4trace:configure.in:193: -1- AC_FUNC_MMAP
++m4trace:configure.in:193: -1- AC_CHECK_HEADERS([stdlib.h unistd.h])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([getpagesize])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the `getpagesize\' function. */
++#undef HAVE_GETPAGESIZE])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_MMAP], [/* Define to 1 if you have a working `mmap\' system call. */
++#undef HAVE_MMAP])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([getsockopt])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETSOCKOPT], [/* Define to 1 if you have the `getsockopt\' function. */
++#undef HAVE_GETSOCKOPT])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_getsockopt])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([setsockopt])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETSOCKOPT], [/* Define to 1 if you have the `setsockopt\' function. */
++#undef HAVE_SETSOCKOPT])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_setsockopt])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8829: AC_FIND_IF_NOT_BROKEN is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([hstrerror])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_HSTRERROR], [/* Define to 1 if you have the `hstrerror\' function. */
++#undef HAVE_HSTRERROR])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_hstrerror])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([hstrerror.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_HSTRERROR_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_HSTRERROR_PROTO], [/* define if the system is missing a prototype for hstrerror() */
++#undef NEED_HSTRERROR_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_ASPRINTF_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_ASPRINTF_PROTO], [/* define if the system is missing a prototype for asprintf() */
++#undef NEED_ASPRINTF_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_VASPRINTF_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_VASPRINTF_PROTO], [/* define if the system is missing a prototype for vasprintf() */
++#undef NEED_VASPRINTF_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_ASNPRINTF_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_ASNPRINTF_PROTO], [/* define if the system is missing a prototype for asnprintf() */
++#undef NEED_ASNPRINTF_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_VASNPRINTF_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_VASNPRINTF_PROTO], [/* define if the system is missing a prototype for vasnprintf() */
++#undef NEED_VASNPRINTF_PROTO])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([bswap16])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_BSWAP16], [/* Define to 1 if you have the `bswap16\' function. */
++#undef HAVE_BSWAP16])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_bswap16])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([bswap32])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_BSWAP32], [/* Define to 1 if you have the `bswap32\' function. */
++#undef HAVE_BSWAP32])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_bswap32])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([pidfile])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_PIDFILE], [/* Define to 1 if you have the `pidfile\' function. */
++#undef HAVE_PIDFILE])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_pidfile])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8829: AC_FIND_IF_NOT_BROKEN is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([getaddrinfo])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETADDRINFO], [/* Define to 1 if you have the `getaddrinfo\' function. */
++#undef HAVE_GETADDRINFO])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_getaddrinfo])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getaddrinfo.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8829: AC_FIND_IF_NOT_BROKEN is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([getnameinfo])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETNAMEINFO], [/* Define to 1 if you have the `getnameinfo\' function. */
++#undef HAVE_GETNAMEINFO])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_getnameinfo])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getnameinfo.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8829: AC_FIND_IF_NOT_BROKEN is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([freeaddrinfo])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_FREEADDRINFO], [/* Define to 1 if you have the `freeaddrinfo\' function. */
++#undef HAVE_FREEADDRINFO])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_freeaddrinfo])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([freeaddrinfo.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:7158: AC_FIND_FUNC is expanded from...
++aclocal.m4:8829: AC_FIND_IF_NOT_BROKEN is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([gai_strerror])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GAI_STRERROR], [/* Define to 1 if you have the `gai_strerror\' function. */
++#undef HAVE_GAI_STRERROR])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_gai_strerror])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([gai_strerror.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CHOWN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define if you have the function `chown\'. */
++#undef HAVE_CHOWN])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([chown.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_COPYHOSTENT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_COPYHOSTENT], [/* Define if you have the function `copyhostent\'. */
++#undef HAVE_COPYHOSTENT])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([copyhostent.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DAEMON])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_DAEMON], [/* Define if you have the function `daemon\'. */
++#undef HAVE_DAEMON])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([daemon.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ECALLOC])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ECALLOC], [/* Define if you have the function `ecalloc\'. */
++#undef HAVE_ECALLOC])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([ecalloc.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EMALLOC])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_EMALLOC], [/* Define if you have the function `emalloc\'. */
++#undef HAVE_EMALLOC])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([emalloc.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_EREALLOC])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_EREALLOC], [/* Define if you have the function `erealloc\'. */
++#undef HAVE_EREALLOC])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([erealloc.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ESTRDUP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ESTRDUP], [/* Define if you have the function `estrdup\'. */
++#undef HAVE_ESTRDUP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([estrdup.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ERR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ERR], [/* Define if you have the function `err\'. */
++#undef HAVE_ERR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([err.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ERRX])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ERRX], [/* Define if you have the function `errx\'. */
++#undef HAVE_ERRX])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([errx.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FCHOWN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_FCHOWN], [/* Define if you have the function `fchown\'. */
++#undef HAVE_FCHOWN])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([fchown.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FLOCK])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_FLOCK], [/* Define if you have the function `flock\'. */
++#undef HAVE_FLOCK])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([flock.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FNMATCH])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_FNMATCH], [/* Define if you have the function `fnmatch\'. */
++#undef HAVE_FNMATCH])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([fnmatch.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FREEHOSTENT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_FREEHOSTENT], [/* Define if you have the function `freehostent\'. */
++#undef HAVE_FREEHOSTENT])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([freehostent.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETCWD])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETCWD], [/* Define if you have the function `getcwd\'. */
++#undef HAVE_GETCWD])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getcwd.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETDTABLESIZE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETDTABLESIZE], [/* Define if you have the function `getdtablesize\'. */
++#undef HAVE_GETDTABLESIZE])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getdtablesize.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETEGID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETEGID], [/* Define if you have the function `getegid\'. */
++#undef HAVE_GETEGID])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getegid.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETEUID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETEUID], [/* Define if you have the function `geteuid\'. */
++#undef HAVE_GETEUID])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([geteuid.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETGID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETGID], [/* Define if you have the function `getgid\'. */
++#undef HAVE_GETGID])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getgid.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETHOSTNAME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETHOSTNAME], [/* Define if you have the function `gethostname\'. */
++#undef HAVE_GETHOSTNAME])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([gethostname.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETIFADDRS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETIFADDRS], [/* Define if you have the function `getifaddrs\'. */
++#undef HAVE_GETIFADDRS])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getifaddrs.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETIPNODEBYADDR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETIPNODEBYADDR], [/* Define if you have the function `getipnodebyaddr\'. */
++#undef HAVE_GETIPNODEBYADDR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getipnodebyaddr.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETIPNODEBYNAME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETIPNODEBYNAME], [/* Define if you have the function `getipnodebyname\'. */
++#undef HAVE_GETIPNODEBYNAME])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getipnodebyname.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETOPT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETOPT], [/* Define if you have the function `getopt\'. */
++#undef HAVE_GETOPT])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getopt.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTIMEOFDAY])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define if you have the function `gettimeofday\'. */
++#undef HAVE_GETTIMEOFDAY])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([gettimeofday.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETUID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETUID], [/* Define if you have the function `getuid\'. */
++#undef HAVE_GETUID])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getuid.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETUSERSHELL])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_GETUSERSHELL], [/* Define if you have the function `getusershell\'. */
++#undef HAVE_GETUSERSHELL])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getusershell.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INITGROUPS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_INITGROUPS], [/* Define if you have the function `initgroups\'. */
++#undef HAVE_INITGROUPS])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([initgroups.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INNETGR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_INNETGR], [/* Define if you have the function `innetgr\'. */
++#undef HAVE_INNETGR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([innetgr.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_IRUSEROK])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_IRUSEROK], [/* Define if you have the function `iruserok\'. */
++#undef HAVE_IRUSEROK])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([iruserok.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LOCALTIME_R])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_LOCALTIME_R], [/* Define if you have the function `localtime_r\'. */
++#undef HAVE_LOCALTIME_R])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([localtime_r.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LSTAT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_LSTAT], [/* Define if you have the function `lstat\'. */
++#undef HAVE_LSTAT])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([lstat.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MEMMOVE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_MEMMOVE], [/* Define if you have the function `memmove\'. */
++#undef HAVE_MEMMOVE])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([memmove.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MKSTEMP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_MKSTEMP], [/* Define if you have the function `mkstemp\'. */
++#undef HAVE_MKSTEMP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([mkstemp.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PUTENV])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define if you have the function `putenv\'. */
++#undef HAVE_PUTENV])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([putenv.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_RCMD])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RCMD], [/* Define if you have the function `rcmd\'. */
++#undef HAVE_RCMD])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([rcmd.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_READV])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_READV], [/* Define if you have the function `readv\'. */
++#undef HAVE_READV])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([readv.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_RECVMSG])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_RECVMSG], [/* Define if you have the function `recvmsg\'. */
++#undef HAVE_RECVMSG])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([recvmsg.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SENDMSG])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SENDMSG], [/* Define if you have the function `sendmsg\'. */
++#undef HAVE_SENDMSG])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([sendmsg.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SETEGID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETEGID], [/* Define if you have the function `setegid\'. */
++#undef HAVE_SETEGID])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([setegid.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SETENV])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETENV], [/* Define if you have the function `setenv\'. */
++#undef HAVE_SETENV])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([setenv.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SETEUID])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SETEUID], [/* Define if you have the function `seteuid\'. */
++#undef HAVE_SETEUID])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([seteuid.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCASECMP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRCASECMP], [/* Define if you have the function `strcasecmp\'. */
++#undef HAVE_STRCASECMP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strcasecmp.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRDUP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRDUP], [/* Define if you have the function `strdup\'. */
++#undef HAVE_STRDUP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strdup.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRERROR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRERROR], [/* Define if you have the function `strerror\'. */
++#undef HAVE_STRERROR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strerror.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRFTIME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRFTIME], [/* Define if you have the function `strftime\'. */
++#undef HAVE_STRFTIME])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strftime.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRLCAT])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRLCAT], [/* Define if you have the function `strlcat\'. */
++#undef HAVE_STRLCAT])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strlcat.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRLCPY])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRLCPY], [/* Define if you have the function `strlcpy\'. */
++#undef HAVE_STRLCPY])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strlcpy.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRLWR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRLWR], [/* Define if you have the function `strlwr\'. */
++#undef HAVE_STRLWR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strlwr.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRNCASECMP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRNCASECMP], [/* Define if you have the function `strncasecmp\'. */
++#undef HAVE_STRNCASECMP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strncasecmp.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRNDUP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRNDUP], [/* Define if you have the function `strndup\'. */
++#undef HAVE_STRNDUP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strndup.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRNLEN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRNLEN], [/* Define if you have the function `strnlen\'. */
++#undef HAVE_STRNLEN])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strnlen.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRPTIME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRPTIME], [/* Define if you have the function `strptime\'. */
++#undef HAVE_STRPTIME])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strptime.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRSEP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRSEP], [/* Define if you have the function `strsep\'. */
++#undef HAVE_STRSEP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strsep.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRSEP_COPY])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRSEP_COPY], [/* Define if you have the function `strsep_copy\'. */
++#undef HAVE_STRSEP_COPY])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strsep_copy.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRTOK_R])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRTOK_R], [/* Define if you have the function `strtok_r\'. */
++#undef HAVE_STRTOK_R])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strtok_r.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUPR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUPR], [/* Define if you have the function `strupr\'. */
++#undef HAVE_STRUPR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([strupr.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SWAB])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SWAB], [/* Define if you have the function `swab\'. */
++#undef HAVE_SWAB])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([swab.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNSETENV])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_UNSETENV], [/* Define if you have the function `unsetenv\'. */
++#undef HAVE_UNSETENV])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([unsetenv.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VERR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VERR], [/* Define if you have the function `verr\'. */
++#undef HAVE_VERR])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([verr.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VERRX])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VERRX], [/* Define if you have the function `verrx\'. */
++#undef HAVE_VERRX])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([verrx.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VSYSLOG])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VSYSLOG], [/* Define if you have the function `vsyslog\'. */
++#undef HAVE_VSYSLOG])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([vsyslog.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VWARN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VWARN], [/* Define if you have the function `vwarn\'. */
++#undef HAVE_VWARN])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([vwarn.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VWARNX])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_VWARNX], [/* Define if you have the function `vwarnx\'. */
++#undef HAVE_VWARNX])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([vwarnx.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WARN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_WARN], [/* Define if you have the function `warn\'. */
++#undef HAVE_WARN])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([warn.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WARNX])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_WARNX], [/* Define if you have the function `warnx\'. */
++#undef HAVE_WARNX])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([warnx.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WRITEV])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_WRITEV], [/* Define if you have the function `writev\'. */
++#undef HAVE_WRITEV])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([writev.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRNDUP_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRNDUP_PROTO], [/* define if the system is missing a prototype for strndup() */
++#undef NEED_STRNDUP_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRSEP_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRSEP_PROTO], [/* define if the system is missing a prototype for strsep() */
++#undef NEED_STRSEP_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRTOK_R_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRTOK_R_PROTO], [/* define if the system is missing a prototype for strtok_r() */
++#undef NEED_STRTOK_R_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRSVIS_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRSVIS_PROTO], [/* define if the system is missing a prototype for strsvis() */
++#undef NEED_STRSVIS_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRUNVIS_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRUNVIS_PROTO], [/* define if the system is missing a prototype for strunvis() */
++#undef NEED_STRUNVIS_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRVIS_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRVIS_PROTO], [/* define if the system is missing a prototype for strvis() */
++#undef NEED_STRVIS_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_STRVISX_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_STRVISX_PROTO], [/* define if the system is missing a prototype for strvisx() */
++#undef NEED_STRVISX_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_SVIS_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_SVIS_PROTO], [/* define if the system is missing a prototype for svis() */
++#undef NEED_SVIS_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_UNVIS_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_UNVIS_PROTO], [/* define if the system is missing a prototype for unvis() */
++#undef NEED_UNVIS_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_VIS_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_VIS_PROTO], [/* define if the system is missing a prototype for vis() */
++#undef NEED_VIS_PROTO])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8869: AC_BROKEN2 is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INET_ATON])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_INET_ATON], [/* define */
++#undef HAVE_INET_ATON])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([inet_aton.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8869: AC_BROKEN2 is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INET_NTOP])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_INET_NTOP], [/* define */
++#undef HAVE_INET_NTOP])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([inet_ntop.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8869: AC_BROKEN2 is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INET_PTON])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_INET_PTON], [/* define */
++#undef HAVE_INET_PTON])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([inet_pton.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_SA_LEN])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_SOCKADDR_SA_LEN], [/* Define if struct sockaddr has field sa_len. */
++#undef HAVE_STRUCT_SOCKADDR_SA_LEN])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:8918: rk_BROKEN_GETNAMEINFO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:8918: rk_BROKEN_GETNAMEINFO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getnameinfo.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:8943: rk_BROKEN_GETADDRINFO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:8943: rk_BROKEN_GETADDRINFO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([getaddrinfo.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -1- AC_LIBSOURCE([freeaddrinfo.c])
++m4trace:configure.in:193: -1- AC_SUBST([LIB@&t@OBJS])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_SETENV_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_SETENV_PROTO], [/* define if the system is missing a prototype for setenv() */
++#undef NEED_SETENV_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_UNSETENV_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_UNSETENV_PROTO], [/* define if the system is missing a prototype for unsetenv() */
++#undef NEED_UNSETENV_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_GETHOSTNAME_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_GETHOSTNAME_PROTO], [/* define if the system is missing a prototype for gethostname() */
++#undef NEED_GETHOSTNAME_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_MKSTEMP_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_MKSTEMP_PROTO], [/* define if the system is missing a prototype for mkstemp() */
++#undef NEED_MKSTEMP_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_GETUSERSHELL_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_GETUSERSHELL_PROTO], [/* define if the system is missing a prototype for getusershell() */
++#undef NEED_GETUSERSHELL_PROTO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_INET_ATON_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_INET_ATON_PROTO], [/* define if the system is missing a prototype for inet_aton() */
++#undef NEED_INET_ATON_PROTO])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_FUNCS([crypt])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_CRYPT], [/* Define to 1 if you have the `crypt\' function. */
++#undef HAVE_CRYPT])
++m4trace:configure.in:193: -1- AC_SUBST([LIB_crypt])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8970: rk_BROKEN_REALLOC is expanded from...
++configure.in:193: rk_BROKEN_REALLOC is required by...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([BROKEN_REALLOC])
++m4trace:configure.in:193: -1- AH_OUTPUT([BROKEN_REALLOC], [/* Define if realloc(NULL) doesn\'t work. */
++#undef BROKEN_REALLOC])
++m4trace:configure.in:193: -1- AH_OUTPUT([zzzz6], [#ifdef BROKEN_REALLOC
++#define realloc(X, Y) isoc_realloc((X), (Y))
++#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y))
++#endif])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8993: AC_PROTO_COMPAT is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([GETHOSTBYNAME_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -1- AH_OUTPUT([GETHOSTBYNAME_PROTO_COMPATIBLE], [/* define if prototype of gethostbyname is compatible with struct hostent
++   *gethostbyname(const char *) */
++#undef GETHOSTBYNAME_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8993: AC_PROTO_COMPAT is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([GETHOSTBYADDR_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -1- AH_OUTPUT([GETHOSTBYADDR_PROTO_COMPATIBLE], [/* define if prototype of gethostbyaddr is compatible with struct hostent
++   *gethostbyaddr(const void *, size_t, int) */
++#undef GETHOSTBYADDR_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8993: AC_PROTO_COMPAT is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([GETSERVBYNAME_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -1- AH_OUTPUT([GETSERVBYNAME_PROTO_COMPATIBLE], [/* define if prototype of getservbyname is compatible with struct servent
++   *getservbyname(const char *, const char *) */
++#undef GETSERVBYNAME_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8993: AC_PROTO_COMPAT is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([GETSOCKNAME_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -1- AH_OUTPUT([GETSOCKNAME_PROTO_COMPATIBLE], [/* define if prototype of getsockname is compatible with int getsockname(int,
++   struct sockaddr*, socklen_t*) */
++#undef GETSOCKNAME_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8993: AC_PROTO_COMPAT is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([OPENLOG_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -1- AH_OUTPUT([OPENLOG_PROTO_COMPATIBLE], [/* define if prototype of openlog is compatible with void openlog(const char
++   *, int, int) */
++#undef OPENLOG_PROTO_COMPATIBLE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8763: AC_NEED_PROTO is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([NEED_CRYPT_PROTO])
++m4trace:configure.in:193: -1- AH_OUTPUT([NEED_CRYPT_PROTO], [/* define if the system is missing a prototype for crypt() */
++#undef NEED_CRYPT_PROTO])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_H_ERRNO])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_H_ERRNO], [/* Define if you have the `h_errno\' variable. */
++#undef HAVE_H_ERRNO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_H_ERRNO_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_H_ERRNO_DECLARATION], [/* define if your system declares h_errno */
++#undef HAVE_H_ERRNO_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_H_ERRLIST])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_H_ERRLIST], [/* Define if you have the `h_errlist\' variable. */
++#undef HAVE_H_ERRLIST])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_H_ERRLIST_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_H_ERRLIST_DECLARATION], [/* define if your system declares h_errlist */
++#undef HAVE_H_ERRLIST_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_H_NERR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_H_NERR], [/* Define if you have the `h_nerr\' variable. */
++#undef HAVE_H_NERR])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_H_NERR_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_H_NERR_DECLARATION], [/* define if your system declares h_nerr */
++#undef HAVE_H_NERR_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE___PROGNAME])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE___PROGNAME], [/* Define if you have the `__progname\' variable. */
++#undef HAVE___PROGNAME])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE___PROGNAME_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE___PROGNAME_DECLARATION], [/* define if your system declares __progname */
++#undef HAVE___PROGNAME_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPTARG_DECLARATION])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_OPTARG_DECLARATION], [/* define if your system declares optarg */
++#undef HAVE_OPTARG_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPTIND_DECLARATION])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_OPTIND_DECLARATION], [/* define if your system declares optind */
++#undef HAVE_OPTIND_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPTERR_DECLARATION])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_OPTERR_DECLARATION], [/* define if your system declares opterr */
++#undef HAVE_OPTERR_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OPTOPT_DECLARATION])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_OPTOPT_DECLARATION], [/* define if your system declares optopt */
++#undef HAVE_OPTOPT_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ENVIRON_DECLARATION])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ENVIRON_DECLARATION], [/* define if your system declares environ */
++#undef HAVE_ENVIRON_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_GMTOFF])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_GMTOFF], [/* Define if struct tm has field tm_gmtoff. */
++#undef HAVE_STRUCT_TM_TM_GMTOFF])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_TM_TM_ZONE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_TM_TM_ZONE], [/* Define if struct tm has field tm_zone. */
++#undef HAVE_STRUCT_TM_TM_ZONE])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TIMEZONE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_TIMEZONE], [/* Define if you have the `timezone\' variable. */
++#undef HAVE_TIMEZONE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_TIMEZONE_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_TIMEZONE_DECLARATION], [/* define if your system declares timezone */
++#undef HAVE_TIMEZONE_DECLARATION])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALTZONE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_ALTZONE], [/* Define if you have the `altzone\' variable. */
++#undef HAVE_ALTZONE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:8683: AC_CHECK_DECLARATION is expanded from...
++aclocal.m4:8654: rk_CHECK_VAR is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_ALTZONE_DECLARATION])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_ALTZONE_DECLARATION], [/* define if your system declares altzone */
++#undef HAVE_ALTZONE_DECLARATION])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([sa_family_t])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SA_FAMILY_T])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SA_FAMILY_T], [/* Define to 1 if the system has the type `sa_family_t\'. */
++#undef HAVE_SA_FAMILY_T])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([socklen_t])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SOCKLEN_T])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_SOCKLEN_T], [/* Define to 1 if the system has the type `socklen_t\'. */
++#undef HAVE_SOCKLEN_T])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([struct sockaddr])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_SOCKADDR], [/* Define to 1 if the system has the type `struct sockaddr\'. */
++#undef HAVE_STRUCT_SOCKADDR])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([struct sockaddr_storage])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SOCKADDR_STORAGE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_SOCKADDR_STORAGE], [/* Define to 1 if the system has the type `struct sockaddr_storage\'. */
++#undef HAVE_STRUCT_SOCKADDR_STORAGE])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([struct addrinfo])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_ADDRINFO])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_ADDRINFO], [/* Define to 1 if the system has the type `struct addrinfo\'. */
++#undef HAVE_STRUCT_ADDRINFO])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([struct ifaddrs])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_IFADDRS])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_IFADDRS], [/* Define to 1 if the system has the type `struct ifaddrs\'. */
++#undef HAVE_STRUCT_IFADDRS])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([struct iovec])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_IOVEC])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_IOVEC], [/* Define to 1 if the system has the type `struct iovec\'. */
++#undef HAVE_STRUCT_IOVEC])
++m4trace:configure.in:193: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_CHECK_TYPES([struct msghdr])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_MSGHDR])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_MSGHDR], [/* Define to 1 if the system has the type `struct msghdr\'. */
++#undef HAVE_STRUCT_MSGHDR])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_WINSIZE])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_WINSIZE], [/* define if struct winsize is declared in sys/termios.h */
++#undef HAVE_STRUCT_WINSIZE])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WS_XPIXEL])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_WS_XPIXEL], [/* define if struct winsize has ws_xpixel */
++#undef HAVE_WS_XPIXEL])
++m4trace:configure.in:193: -2- AC_DEFINE_TRACE_LITERAL([HAVE_WS_YPIXEL])
++m4trace:configure.in:193: -2- AH_OUTPUT([HAVE_WS_YPIXEL], [/* define if struct winsize has ws_ypixel */
++#undef HAVE_WS_YPIXEL])
++m4trace:configure.in:193: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:9041: AC_KRB_STRUCT_SPWD is expanded from...
++aclocal.m4:8396: rk_ROKEN is expanded from...
++configure.in:193: the top level])
++m4trace:configure.in:193: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_SPWD])
++m4trace:configure.in:193: -1- AH_OUTPUT([HAVE_STRUCT_SPWD], [/* define if you have struct spwd */
++#undef HAVE_STRUCT_SPWD])
++m4trace:configure.in:197: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:9067: rk_OTP is expanded from...
++configure.in:197: the top level])
++m4trace:configure.in:197: -1- AC_DEFINE_TRACE_LITERAL([OTP])
++m4trace:configure.in:197: -1- AH_OUTPUT([OTP], [/* Define if you want OTP support in applications. */
++#undef OTP])
++m4trace:configure.in:197: -1- AM_CONDITIONAL([OTP], [test "$enable_otp" = yes])
++m4trace:configure.in:197: -1- AC_SUBST([OTP_TRUE])
++m4trace:configure.in:197: -1- AC_SUBST([OTP_FALSE])
++m4trace:configure.in:199: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:9082: AC_CHECK_OSFC2 is expanded from...
++configure.in:199: the top level])
++m4trace:configure.in:199: -1- AC_DEFINE_TRACE_LITERAL([HAVE_OSFC2])
++m4trace:configure.in:199: -1- AH_OUTPUT([HAVE_OSFC2], [/* Define to enable basic OSF C2 support. */
++#undef HAVE_OSFC2])
++m4trace:configure.in:199: -1- AC_SUBST([LIB_security])
++m4trace:configure.in:202: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++configure.in:202: the top level])
++m4trace:configure.in:204: -1- AC_DEFINE_TRACE_LITERAL([NO_MMAP])
++m4trace:configure.in:204: -1- AH_OUTPUT([NO_MMAP], [/* Define if you don\'t want to use mmap. */
++#undef NO_MMAP])
++m4trace:configure.in:207: -1- AC_SUBST([NROFF], [$ac_cv_path_NROFF])
++m4trace:configure.in:207: -1- AC_SUBST([GROFF], [$ac_cv_path_GROFF])
++m4trace:configure.in:207: -1- AC_SUBST([CATMAN])
++m4trace:configure.in:207: -1- AM_CONDITIONAL([CATMAN], [test "$CATMAN"])
++m4trace:configure.in:207: -1- AC_SUBST([CATMAN_TRUE])
++m4trace:configure.in:207: -1- AC_SUBST([CATMAN_FALSE])
++m4trace:configure.in:207: -1- AC_SUBST([CATMANEXT])
++m4trace:configure.in:211: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:211: the top level])
++m4trace:configure.in:211: -1- AC_DEFINE_TRACE_LITERAL([READLINE])
++m4trace:configure.in:211: -1- AH_OUTPUT([READLINE], [/* Define if you have the readline package. */
++#undef READLINE])
++m4trace:configure.in:211: -1- AC_SUBST([DIR_readline])
++m4trace:configure.in:211: -1- AC_SUBST([INCLUDE_readline])
++m4trace:configure.in:211: -1- AC_SUBST([LIB_readline])
++m4trace:configure.in:213: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:213: the top level])
++m4trace:configure.in:213: -1- AC_DEFINE_TRACE_LITERAL([HESIOD])
++m4trace:configure.in:213: -1- AH_OUTPUT([HESIOD], [/* Define if you have the hesiod package. */
++#undef HESIOD])
++m4trace:configure.in:213: -1- AC_SUBST([DIR_hesiod])
++m4trace:configure.in:213: -1- AC_SUBST([INCLUDE_hesiod])
++m4trace:configure.in:213: -1- AC_SUBST([LIB_hesiod])
++m4trace:configure.in:215: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:215: the top level])
++m4trace:configure.in:215: -1- AC_DEFINE_TRACE_LITERAL([SL])
++m4trace:configure.in:215: -1- AH_OUTPUT([SL], [/* Define if you have the sl package. */
++#undef SL])
++m4trace:configure.in:215: -1- AC_SUBST([DIR_sl])
++m4trace:configure.in:215: -1- AC_SUBST([INCLUDE_sl])
++m4trace:configure.in:215: -1- AC_SUBST([LIB_sl])
++m4trace:configure.in:220: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:220: the top level])
++m4trace:configure.in:220: -1- AC_DEFINE_TRACE_LITERAL([SS])
++m4trace:configure.in:220: -1- AH_OUTPUT([SS], [/* Define if you have the ss package. */
++#undef SS])
++m4trace:configure.in:220: -1- AC_SUBST([DIR_ss])
++m4trace:configure.in:220: -1- AC_SUBST([INCLUDE_ss])
++m4trace:configure.in:220: -1- AC_SUBST([LIB_ss])
++m4trace:configure.in:228: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:7148: rk_TEST_PACKAGE is expanded from...
++configure.in:228: the top level])
++m4trace:configure.in:228: -1- AC_DEFINE_TRACE_LITERAL([OTP])
++m4trace:configure.in:228: -1- AH_OUTPUT([OTP], [/* Define if you have the otp package. */
++#undef OTP])
++m4trace:configure.in:228: -1- AC_SUBST([DIR_otp])
++m4trace:configure.in:228: -1- AC_SUBST([INCLUDE_otp])
++m4trace:configure.in:228: -1- AC_SUBST([LIB_otp])
++m4trace:configure.in:235: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:9203: KRB_C_BIGENDIAN is expanded from...
++configure.in:235: the top level])
++m4trace:configure.in:235: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:9203: KRB_C_BIGENDIAN is expanded from...
++configure.in:235: the top level])
++m4trace:configure.in:235: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:9203: KRB_C_BIGENDIAN is expanded from...
++configure.in:235: the top level])
++m4trace:configure.in:235: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:9203: KRB_C_BIGENDIAN is expanded from...
++configure.in:235: the top level])
++m4trace:configure.in:235: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:9203: KRB_C_BIGENDIAN is expanded from...
++configure.in:235: the top level])
++m4trace:configure.in:235: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
++m4trace:configure.in:235: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* define if target is big endian */
++#undef WORDS_BIGENDIAN])
++m4trace:configure.in:235: -1- AC_DEFINE_TRACE_LITERAL([ENDIANESS_IN_SYS_PARAM_H])
++m4trace:configure.in:235: -1- AH_OUTPUT([ENDIANESS_IN_SYS_PARAM_H], [/* define if sys/param.h defines the endiness */
++#undef ENDIANESS_IN_SYS_PARAM_H])
++m4trace:configure.in:235: -1- AH_OUTPUT([zzzz7], [
++#if ENDIANESS_IN_SYS_PARAM_H
++#  include <sys/types.h>
++#  include <sys/param.h>
++#  if BYTE_ORDER == BIG_ENDIAN
++#  define WORDS_BIGENDIAN 1
++#  endif
++#endif
++])
++m4trace:configure.in:236: -1- AC_C_INLINE
++m4trace:configure.in:236: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
++   calls it, or to nothing if \'inline\' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif])
++m4trace:configure.in:238: -1- AM_CONDITIONAL([AIX], [test "$aix" != no])
++m4trace:configure.in:238: -1- AC_SUBST([AIX_TRUE])
++m4trace:configure.in:238: -1- AC_SUBST([AIX_FALSE])
++m4trace:configure.in:238: -1- AM_CONDITIONAL([AIX4], [test "$aix" = 4])
++m4trace:configure.in:238: -1- AC_SUBST([AIX4_TRUE])
++m4trace:configure.in:238: -1- AC_SUBST([AIX4_FALSE])
++m4trace:configure.in:238: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++aclocal.m4:9261: rk_AIX is expanded from...
++configure.in:238: the top level])
++m4trace:configure.in:238: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9270: rk_DLOPEN is expanded from...
++configure.in:238: rk_DLOPEN is required by...
++aclocal.m4:9261: rk_AIX is expanded from...
++configure.in:238: the top level])
++m4trace:configure.in:238: -1- AC_CHECK_FUNCS([dlopen])
++m4trace:configure.in:238: -1- AH_OUTPUT([HAVE_DLOPEN], [/* Define to 1 if you have the `dlopen\' function. */
++#undef HAVE_DLOPEN])
++m4trace:configure.in:238: -1- AC_SUBST([LIB_dlopen])
++m4trace:configure.in:238: -1- AM_CONDITIONAL([HAVE_DLOPEN], [test "$ac_cv_funclib_dlopen" != no])
++m4trace:configure.in:238: -1- AC_SUBST([HAVE_DLOPEN_TRUE])
++m4trace:configure.in:238: -1- AC_SUBST([HAVE_DLOPEN_FALSE])
++m4trace:configure.in:238: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9261: rk_AIX is expanded from...
++configure.in:238: the top level])
++m4trace:configure.in:238: -1- AC_CHECK_FUNCS([loadquery])
++m4trace:configure.in:238: -1- AH_OUTPUT([HAVE_LOADQUERY], [/* Define to 1 if you have the `loadquery\' function. */
++#undef HAVE_LOADQUERY])
++m4trace:configure.in:238: -1- AC_SUBST([LIB_loadquery])
++m4trace:configure.in:238: -1- AM_CONDITIONAL([AIX_DYNAMIC_AFS], [test "$enable_dynamic_afs" != no])
++m4trace:configure.in:238: -1- AC_SUBST([AIX_DYNAMIC_AFS_TRUE])
++m4trace:configure.in:238: -1- AC_SUBST([AIX_DYNAMIC_AFS_FALSE])
++m4trace:configure.in:238: -1- AC_SUBST([AIX_EXTRA_KAFS])
++m4trace:configure.in:238: -1- AH_OUTPUT([zzzz8], [#if _AIX
++#define _ALL_SOURCE
++/* XXX this is gross, but kills about a gazillion warnings */
++struct ether_addr;
++struct sockaddr;
++struct sockaddr_dl;
++struct sockaddr_in;
++#endif])
++m4trace:configure.in:239: -1- AC_DEFINE_TRACE_LITERAL([IRIX4])
++m4trace:configure.in:239: -1- AH_OUTPUT([IRIX4], [/* Define if you are running IRIX 4. */
++#undef IRIX4])
++m4trace:configure.in:239: -1- AM_CONDITIONAL([IRIX], [test "$irix" != no])
++m4trace:configure.in:239: -1- AC_SUBST([IRIX_TRUE])
++m4trace:configure.in:239: -1- AC_SUBST([IRIX_FALSE])
++m4trace:configure.in:239: -1- AH_OUTPUT([zzzz9], [
++/* IRIX 4 braindamage */
++#if IRIX == 4 && !defined(__STDC__)
++#define __STDC__ 0
++#endif
++])
++m4trace:configure.in:240: -1- AC_DEFINE_TRACE_LITERAL([SunOS])
++m4trace:configure.in:240: -1- AH_OUTPUT([SunOS], [/* Define to what version of SunOS you are running. */
++#undef SunOS])
++m4trace:configure.in:242: -1- AC_PATH_X([])
++m4trace:configure.in:242: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING])
++m4trace:configure.in:242: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */
++#undef X_DISPLAY_MISSING])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"])
++m4trace:configure.in:242: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS])
++m4trace:configure.in:242: -1- AC_SUBST([X_CFLAGS])
++m4trace:configure.in:242: -1- AC_SUBST([X_PRE_LIBS])
++m4trace:configure.in:242: -1- AC_SUBST([X_LIBS])
++m4trace:configure.in:242: -1- AC_SUBST([X_EXTRA_LIBS])
++m4trace:configure.in:242: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:9375: KRB_CHECK_X is expanded from...
++configure.in:242: the top level])
++m4trace:configure.in:242: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:9375: KRB_CHECK_X is expanded from...
++configure.in:242: the top level])
++m4trace:configure.in:244: -1- AM_CONDITIONAL([HAVE_X], [test "$no_x" != yes])
++m4trace:configure.in:244: -1- AC_SUBST([HAVE_X_TRUE])
++m4trace:configure.in:244: -1- AC_SUBST([HAVE_X_FALSE])
++m4trace:configure.in:246: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9434: AC_CHECK_XAU is expanded from...
++configure.in:246: the top level])
++m4trace:configure.in:246: -1- AC_CHECK_FUNCS([XauWriteAuth])
++m4trace:configure.in:246: -1- AH_OUTPUT([HAVE_XAUWRITEAUTH], [/* Define to 1 if you have the `XauWriteAuth\' function. */
++#undef HAVE_XAUWRITEAUTH])
++m4trace:configure.in:246: -1- AC_SUBST([LIB_XauWriteAuth])
++m4trace:configure.in:246: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9434: AC_CHECK_XAU is expanded from...
++configure.in:246: the top level])
++m4trace:configure.in:246: -1- AC_CHECK_FUNCS([XauReadAuth])
++m4trace:configure.in:246: -1- AH_OUTPUT([HAVE_XAUREADAUTH], [/* Define to 1 if you have the `XauReadAuth\' function. */
++#undef HAVE_XAUREADAUTH])
++m4trace:configure.in:246: -1- AC_SUBST([LIB_XauReadAuth])
++m4trace:configure.in:246: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9434: AC_CHECK_XAU is expanded from...
++configure.in:246: the top level])
++m4trace:configure.in:246: -1- AC_CHECK_FUNCS([XauFileName])
++m4trace:configure.in:246: -1- AH_OUTPUT([HAVE_XAUFILENAME], [/* Define to 1 if you have the `XauFileName\' function. */
++#undef HAVE_XAUFILENAME])
++m4trace:configure.in:246: -1- AC_SUBST([LIB_XauFileName])
++m4trace:configure.in:246: -1- AM_CONDITIONAL([NEED_WRITEAUTH], [test "$ac_cv_func_XauWriteAuth" != "yes"])
++m4trace:configure.in:246: -1- AC_SUBST([NEED_WRITEAUTH_TRUE])
++m4trace:configure.in:246: -1- AC_SUBST([NEED_WRITEAUTH_FALSE])
++m4trace:configure.in:246: -1- AC_SUBST([NEED_WRITEAUTH_TRUE])
++m4trace:configure.in:246: -1- AC_SUBST([NEED_WRITEAUTH_FALSE])
++m4trace:configure.in:251: -1- AC_C_CONST
++m4trace:configure.in:251: -1- AC_DEFINE_TRACE_LITERAL([const])
++m4trace:configure.in:251: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
++#undef const])
++m4trace:configure.in:252: -1- AC_TYPE_OFF_T
++m4trace:configure.in:252: -1- AC_DEFINE_TRACE_LITERAL([off_t])
++m4trace:configure.in:252: -1- AH_OUTPUT([off_t], [/* Define to `long\' if <sys/types.h> does not define. */
++#undef off_t])
++m4trace:configure.in:253: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
++m4trace:configure.in:253: -1- AH_OUTPUT([mode_t], [/* Define this to what the type mode_t should be. */
++#undef mode_t])
++m4trace:configure.in:254: -1- AC_DEFINE_TRACE_LITERAL([sig_atomic_t])
++m4trace:configure.in:254: -1- AH_OUTPUT([sig_atomic_t], [/* Define this to what the type sig_atomic_t should be. */
++#undef sig_atomic_t])
++m4trace:configure.in:255: -2- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++aclocal.m4:8427: AC_HAVE_TYPE is expanded from...
++configure.in:255: the top level])
++m4trace:configure.in:255: -1- AC_CHECK_TYPES([long long])
++m4trace:configure.in:255: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LONG_LONG])
++m4trace:configure.in:255: -1- AH_OUTPUT([HAVE_LONG_LONG], [/* Define to 1 if the system has the type `long long\'. */
++#undef HAVE_LONG_LONG])
++m4trace:configure.in:256: -1- AC_HEADER_TIME
++m4trace:configure.in:256: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
++m4trace:configure.in:256: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#undef TIME_WITH_SYS_TIME])
++m4trace:configure.in:257: -1- AC_STRUCT_TM
++m4trace:configure.in:257: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
++m4trace:configure.in:257: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
++#undef TM_IN_SYS_TIME])
++m4trace:configure.in:260: -1- AC_HEADER_STDC
++m4trace:configure.in:260: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
++m4trace:configure.in:260: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS])
++m4trace:configure.in:313: -1- AC_CHECK_HEADERS([\
++	arpa/ftp.h				\
++	arpa/telnet.h				\
++	bind/bitypes.h				\
++	bsdsetjmp.h				\
++	curses.h				\
++	dlfcn.h					\
++	fnmatch.h				\
++	inttypes.h				\
++	io.h					\
++	libutil.h				\
++	limits.h				\
++	maillock.h				\
++	netgroup.h				\
++	netinet/in6_machtypes.h			\
++	netinfo/ni.h				\
++	pthread.h				\
++	pty.h					\
++	sac.h					\
++	security/pam_modules.h			\
++	sgtty.h					\
++	siad.h					\
++	signal.h				\
++	stropts.h				\
++	sys/bitypes.h				\
++	sys/category.h				\
++	sys/file.h				\
++	sys/filio.h				\
++	sys/ioccom.h				\
++	sys/mman.h				\
++	sys/pty.h				\
++	sys/ptyio.h				\
++	sys/ptyvar.h				\
++	sys/select.h				\
++	sys/str_tty.h				\
++	sys/stream.h				\
++	sys/stropts.h				\
++	sys/strtty.h				\
++	sys/syscall.h				\
++	sys/termio.h				\
++	sys/timeb.h				\
++	sys/times.h				\
++	sys/un.h				\
++	term.h					\
++	termcap.h				\
++	termio.h				\
++	time.h					\
++	tmpdir.h				\
++	udb.h					\
++	utmp.h					\
++	utmpx.h					\
++])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_ARPA_FTP_H], [/* Define to 1 if you have the <arpa/ftp.h> header file. */
++#undef HAVE_ARPA_FTP_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_ARPA_TELNET_H], [/* Define to 1 if you have the <arpa/telnet.h> header file. */
++#undef HAVE_ARPA_TELNET_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_BIND_BITYPES_H], [/* Define to 1 if you have the <bind/bitypes.h> header file. */
++#undef HAVE_BIND_BITYPES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_BSDSETJMP_H], [/* Define to 1 if you have the <bsdsetjmp.h> header file. */
++#undef HAVE_BSDSETJMP_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_CURSES_H], [/* Define to 1 if you have the <curses.h> header file. */
++#undef HAVE_CURSES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_FNMATCH_H], [/* Define to 1 if you have the <fnmatch.h> header file. */
++#undef HAVE_FNMATCH_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_IO_H], [/* Define to 1 if you have the <io.h> header file. */
++#undef HAVE_IO_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_LIBUTIL_H], [/* Define to 1 if you have the <libutil.h> header file. */
++#undef HAVE_LIBUTIL_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
++#undef HAVE_LIMITS_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_MAILLOCK_H], [/* Define to 1 if you have the <maillock.h> header file. */
++#undef HAVE_MAILLOCK_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_NETGROUP_H], [/* Define to 1 if you have the <netgroup.h> header file. */
++#undef HAVE_NETGROUP_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_NETINET_IN6_MACHTYPES_H], [/* Define to 1 if you have the <netinet/in6_machtypes.h> header file. */
++#undef HAVE_NETINET_IN6_MACHTYPES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_NETINFO_NI_H], [/* Define to 1 if you have the <netinfo/ni.h> header file. */
++#undef HAVE_NETINFO_NI_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
++#undef HAVE_PTHREAD_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_PTY_H], [/* Define to 1 if you have the <pty.h> header file. */
++#undef HAVE_PTY_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SAC_H], [/* Define to 1 if you have the <sac.h> header file. */
++#undef HAVE_SAC_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SECURITY_PAM_MODULES_H], [/* Define to 1 if you have the <security/pam_modules.h> header file. */
++#undef HAVE_SECURITY_PAM_MODULES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SGTTY_H], [/* Define to 1 if you have the <sgtty.h> header file. */
++#undef HAVE_SGTTY_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SIAD_H], [/* Define to 1 if you have the <siad.h> header file. */
++#undef HAVE_SIAD_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
++#undef HAVE_SIGNAL_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
++#undef HAVE_STROPTS_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_BITYPES_H], [/* Define to 1 if you have the <sys/bitypes.h> header file. */
++#undef HAVE_SYS_BITYPES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_CATEGORY_H], [/* Define to 1 if you have the <sys/category.h> header file. */
++#undef HAVE_SYS_CATEGORY_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_FILE_H], [/* Define to 1 if you have the <sys/file.h> header file. */
++#undef HAVE_SYS_FILE_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_FILIO_H], [/* Define to 1 if you have the <sys/filio.h> header file. */
++#undef HAVE_SYS_FILIO_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_IOCCOM_H], [/* Define to 1 if you have the <sys/ioccom.h> header file. */
++#undef HAVE_SYS_IOCCOM_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_MMAN_H], [/* Define to 1 if you have the <sys/mman.h> header file. */
++#undef HAVE_SYS_MMAN_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_PTY_H], [/* Define to 1 if you have the <sys/pty.h> header file. */
++#undef HAVE_SYS_PTY_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_PTYIO_H], [/* Define to 1 if you have the <sys/ptyio.h> header file. */
++#undef HAVE_SYS_PTYIO_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_PTYVAR_H], [/* Define to 1 if you have the <sys/ptyvar.h> header file. */
++#undef HAVE_SYS_PTYVAR_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
++#undef HAVE_SYS_SELECT_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_STR_TTY_H], [/* Define to 1 if you have the <sys/str_tty.h> header file. */
++#undef HAVE_SYS_STR_TTY_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_STREAM_H], [/* Define to 1 if you have the <sys/stream.h> header file. */
++#undef HAVE_SYS_STREAM_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_STROPTS_H], [/* Define to 1 if you have the <sys/stropts.h> header file. */
++#undef HAVE_SYS_STROPTS_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_STRTTY_H], [/* Define to 1 if you have the <sys/strtty.h> header file. */
++#undef HAVE_SYS_STRTTY_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_SYSCALL_H], [/* Define to 1 if you have the <sys/syscall.h> header file. */
++#undef HAVE_SYS_SYSCALL_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_TERMIO_H], [/* Define to 1 if you have the <sys/termio.h> header file. */
++#undef HAVE_SYS_TERMIO_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_TIMEB_H], [/* Define to 1 if you have the <sys/timeb.h> header file. */
++#undef HAVE_SYS_TIMEB_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_TIMES_H], [/* Define to 1 if you have the <sys/times.h> header file. */
++#undef HAVE_SYS_TIMES_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
++#undef HAVE_SYS_UN_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_TERM_H], [/* Define to 1 if you have the <term.h> header file. */
++#undef HAVE_TERM_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_TERMCAP_H], [/* Define to 1 if you have the <termcap.h> header file. */
++#undef HAVE_TERMCAP_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_TERMIO_H], [/* Define to 1 if you have the <termio.h> header file. */
++#undef HAVE_TERMIO_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_TIME_H], [/* Define to 1 if you have the <time.h> header file. */
++#undef HAVE_TIME_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_TMPDIR_H], [/* Define to 1 if you have the <tmpdir.h> header file. */
++#undef HAVE_TMPDIR_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_UDB_H], [/* Define to 1 if you have the <udb.h> header file. */
++#undef HAVE_UDB_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_UTMP_H], [/* Define to 1 if you have the <utmp.h> header file. */
++#undef HAVE_UTMP_H])
++m4trace:configure.in:313: -1- AH_OUTPUT([HAVE_UTMPX_H], [/* Define to 1 if you have the <utmpx.h> header file. */
++#undef HAVE_UTMPX_H])
++m4trace:configure.in:316: -2- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++configure.in:316: the top level])
++m4trace:configure.in:320: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NETINFO])
++m4trace:configure.in:320: -1- AH_OUTPUT([HAVE_NETINFO], [/* Define if you want to use Netinfo instead of krb5.conf. */
++#undef HAVE_NETINFO])
++m4trace:configure.in:325: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++configure.in:325: the top level])
++m4trace:configure.in:325: -1- AC_CHECK_FUNCS([logwtmp])
++m4trace:configure.in:325: -1- AH_OUTPUT([HAVE_LOGWTMP], [/* Define to 1 if you have the `logwtmp\' function. */
++#undef HAVE_LOGWTMP])
++m4trace:configure.in:325: -1- AC_SUBST([LIB_logwtmp])
++m4trace:configure.in:326: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++configure.in:326: the top level])
++m4trace:configure.in:326: -1- AC_CHECK_FUNCS([logout])
++m4trace:configure.in:326: -1- AH_OUTPUT([HAVE_LOGOUT], [/* Define to 1 if you have the `logout\' function. */
++#undef HAVE_LOGOUT])
++m4trace:configure.in:326: -1- AC_SUBST([LIB_logout])
++m4trace:configure.in:327: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++configure.in:327: the top level])
++m4trace:configure.in:327: -1- AC_CHECK_FUNCS([openpty])
++m4trace:configure.in:327: -1- AH_OUTPUT([HAVE_OPENPTY], [/* Define to 1 if you have the `openpty\' function. */
++#undef HAVE_OPENPTY])
++m4trace:configure.in:327: -1- AC_SUBST([LIB_openpty])
++m4trace:configure.in:328: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++configure.in:328: the top level])
++m4trace:configure.in:328: -1- AC_CHECK_FUNCS([tgetent])
++m4trace:configure.in:328: -1- AH_OUTPUT([HAVE_TGETENT], [/* Define to 1 if you have the `tgetent\' function. */
++#undef HAVE_TGETENT])
++m4trace:configure.in:328: -1- AC_SUBST([LIB_tgetent])
++m4trace:configure.in:361: -1- AC_CHECK_FUNCS([				\
++	_getpty					\
++	_scrsize				\
++	fcntl					\
++	grantpt					\
++	mktime					\
++	ptsname					\
++	rand					\
++	revoke					\
++	select					\
++	setitimer				\
++	setpcred				\
++	setpgid					\
++	setproctitle				\
++	setregid				\
++	setresgid				\
++	setresuid				\
++	setreuid				\
++	setsid					\
++	setutent				\
++	sigaction				\
++	strstr					\
++	timegm					\
++	ttyname					\
++	ttyslot					\
++	umask					\
++	unlockpt				\
++	vhangup					\
++	yp_get_default_domain			\
++])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE__GETPTY], [/* Define to 1 if you have the `_getpty\' function. */
++#undef HAVE__GETPTY])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE__SCRSIZE], [/* Define to 1 if you have the `_scrsize\' function. */
++#undef HAVE__SCRSIZE])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_FCNTL], [/* Define to 1 if you have the `fcntl\' function. */
++#undef HAVE_FCNTL])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_GRANTPT], [/* Define to 1 if you have the `grantpt\' function. */
++#undef HAVE_GRANTPT])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_MKTIME], [/* Define to 1 if you have the `mktime\' function. */
++#undef HAVE_MKTIME])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_PTSNAME], [/* Define to 1 if you have the `ptsname\' function. */
++#undef HAVE_PTSNAME])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_RAND], [/* Define to 1 if you have the `rand\' function. */
++#undef HAVE_RAND])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_REVOKE], [/* Define to 1 if you have the `revoke\' function. */
++#undef HAVE_REVOKE])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
++#undef HAVE_SELECT])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETITIMER], [/* Define to 1 if you have the `setitimer\' function. */
++#undef HAVE_SETITIMER])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETPCRED], [/* Define to 1 if you have the `setpcred\' function. */
++#undef HAVE_SETPCRED])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETPGID], [/* Define to 1 if you have the `setpgid\' function. */
++#undef HAVE_SETPGID])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETPROCTITLE], [/* Define to 1 if you have the `setproctitle\' function. */
++#undef HAVE_SETPROCTITLE])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETREGID], [/* Define to 1 if you have the `setregid\' function. */
++#undef HAVE_SETREGID])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETRESGID], [/* Define to 1 if you have the `setresgid\' function. */
++#undef HAVE_SETRESGID])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETRESUID], [/* Define to 1 if you have the `setresuid\' function. */
++#undef HAVE_SETRESUID])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETREUID], [/* Define to 1 if you have the `setreuid\' function. */
++#undef HAVE_SETREUID])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETSID], [/* Define to 1 if you have the `setsid\' function. */
++#undef HAVE_SETSID])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SETUTENT], [/* Define to 1 if you have the `setutent\' function. */
++#undef HAVE_SETUTENT])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
++#undef HAVE_SIGACTION])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_STRSTR], [/* Define to 1 if you have the `strstr\' function. */
++#undef HAVE_STRSTR])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_TIMEGM], [/* Define to 1 if you have the `timegm\' function. */
++#undef HAVE_TIMEGM])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_TTYNAME], [/* Define to 1 if you have the `ttyname\' function. */
++#undef HAVE_TTYNAME])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_TTYSLOT], [/* Define to 1 if you have the `ttyslot\' function. */
++#undef HAVE_TTYSLOT])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_UMASK], [/* Define to 1 if you have the `umask\' function. */
++#undef HAVE_UMASK])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_UNLOCKPT], [/* Define to 1 if you have the `unlockpt\' function. */
++#undef HAVE_UNLOCKPT])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_VHANGUP], [/* Define to 1 if you have the `vhangup\' function. */
++#undef HAVE_VHANGUP])
++m4trace:configure.in:361: -1- AH_OUTPUT([HAVE_YP_GET_DEFAULT_DOMAIN], [/* Define to 1 if you have the `yp_get_default_domain\' function. */
++#undef HAVE_YP_GET_DEFAULT_DOMAIN])
++m4trace:configure.in:363: -1- AC_FUNC_MMAP
++m4trace:configure.in:363: -1- AC_CHECK_HEADERS([stdlib.h unistd.h])
++m4trace:configure.in:363: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:363: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:363: -1- AC_CHECK_FUNCS([getpagesize])
++m4trace:configure.in:363: -1- AH_OUTPUT([HAVE_GETPAGESIZE], [/* Define to 1 if you have the `getpagesize\' function. */
++#undef HAVE_GETPAGESIZE])
++m4trace:configure.in:363: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MMAP])
++m4trace:configure.in:363: -1- AH_OUTPUT([HAVE_MMAP], [/* Define to 1 if you have a working `mmap\' system call. */
++#undef HAVE_MMAP])
++m4trace:configure.in:365: -1- AC_CHECK_HEADERS([capability.h sys/capability.h])
++m4trace:configure.in:365: -1- AH_OUTPUT([HAVE_CAPABILITY_H], [/* Define to 1 if you have the <capability.h> header file. */
++#undef HAVE_CAPABILITY_H])
++m4trace:configure.in:365: -1- AH_OUTPUT([HAVE_SYS_CAPABILITY_H], [/* Define to 1 if you have the <sys/capability.h> header file. */
++#undef HAVE_SYS_CAPABILITY_H])
++m4trace:configure.in:365: -1- AC_CHECK_FUNCS([sgi_getcapabilitybyname cap_set_proc])
++m4trace:configure.in:365: -1- AH_OUTPUT([HAVE_SGI_GETCAPABILITYBYNAME], [/* Define to 1 if you have the `sgi_getcapabilitybyname\' function. */
++#undef HAVE_SGI_GETCAPABILITYBYNAME])
++m4trace:configure.in:365: -1- AH_OUTPUT([HAVE_CAP_SET_PROC], [/* Define to 1 if you have the `cap_set_proc\' function. */
++#undef HAVE_CAP_SET_PROC])
++m4trace:configure.in:367: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9498: AC_CHECK_GETPWNAM_R_POSIX is expanded from...
++configure.in:367: the top level])
++m4trace:configure.in:367: -1- AC_CHECK_FUNCS([getpwnam_r])
++m4trace:configure.in:367: -1- AH_OUTPUT([HAVE_GETPWNAM_R], [/* Define to 1 if you have the `getpwnam_r\' function. */
++#undef HAVE_GETPWNAM_R])
++m4trace:configure.in:367: -1- AC_SUBST([LIB_getpwnam_r])
++m4trace:configure.in:367: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:9498: AC_CHECK_GETPWNAM_R_POSIX is expanded from...
++configure.in:367: the top level])
++m4trace:configure.in:367: -1- AC_DEFINE_TRACE_LITERAL([POSIX_GETPWNAM_R])
++m4trace:configure.in:367: -1- AH_OUTPUT([POSIX_GETPWNAM_R], [/* Define if getpwnam_r has POSIX flavour. */
++#undef POSIX_GETPWNAM_R])
++m4trace:configure.in:370: -1- AC_CHECK_FUNCS([getudbnam setlim])
++m4trace:configure.in:370: -1- AH_OUTPUT([HAVE_GETUDBNAM], [/* Define to 1 if you have the `getudbnam\' function. */
++#undef HAVE_GETUDBNAM])
++m4trace:configure.in:370: -1- AH_OUTPUT([HAVE_SETLIM], [/* Define to 1 if you have the `setlim\' function. */
++#undef HAVE_SETLIM])
++m4trace:configure.in:378: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:378: the top level])
++m4trace:configure.in:378: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMP_UT_ADDR])
++m4trace:configure.in:378: -1- AH_OUTPUT([HAVE_STRUCT_UTMP_UT_ADDR], [/* Define if struct utmp has field ut_addr. */
++#undef HAVE_STRUCT_UTMP_UT_ADDR])
++m4trace:configure.in:379: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:379: the top level])
++m4trace:configure.in:379: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMP_UT_HOST])
++m4trace:configure.in:379: -1- AH_OUTPUT([HAVE_STRUCT_UTMP_UT_HOST], [/* Define if struct utmp has field ut_host. */
++#undef HAVE_STRUCT_UTMP_UT_HOST])
++m4trace:configure.in:380: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:380: the top level])
++m4trace:configure.in:380: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMP_UT_ID])
++m4trace:configure.in:380: -1- AH_OUTPUT([HAVE_STRUCT_UTMP_UT_ID], [/* Define if struct utmp has field ut_id. */
++#undef HAVE_STRUCT_UTMP_UT_ID])
++m4trace:configure.in:381: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:381: the top level])
++m4trace:configure.in:381: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMP_UT_PID])
++m4trace:configure.in:381: -1- AH_OUTPUT([HAVE_STRUCT_UTMP_UT_PID], [/* Define if struct utmp has field ut_pid. */
++#undef HAVE_STRUCT_UTMP_UT_PID])
++m4trace:configure.in:382: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:382: the top level])
++m4trace:configure.in:382: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMP_UT_TYPE])
++m4trace:configure.in:382: -1- AH_OUTPUT([HAVE_STRUCT_UTMP_UT_TYPE], [/* Define if struct utmp has field ut_type. */
++#undef HAVE_STRUCT_UTMP_UT_TYPE])
++m4trace:configure.in:383: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:383: the top level])
++m4trace:configure.in:383: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMP_UT_USER])
++m4trace:configure.in:383: -1- AH_OUTPUT([HAVE_STRUCT_UTMP_UT_USER], [/* Define if struct utmp has field ut_user. */
++#undef HAVE_STRUCT_UTMP_UT_USER])
++m4trace:configure.in:384: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:384: the top level])
++m4trace:configure.in:384: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMPX_UT_EXIT])
++m4trace:configure.in:384: -1- AH_OUTPUT([HAVE_STRUCT_UTMPX_UT_EXIT], [/* Define if struct utmpx has field ut_exit. */
++#undef HAVE_STRUCT_UTMPX_UT_EXIT])
++m4trace:configure.in:385: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:8889: AC_HAVE_STRUCT_FIELD is expanded from...
++configure.in:385: the top level])
++m4trace:configure.in:385: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRUCT_UTMPX_UT_SYSLEN])
++m4trace:configure.in:385: -1- AH_OUTPUT([HAVE_STRUCT_UTMPX_UT_SYSLEN], [/* Define if struct utmpx has field ut_syslen. */
++#undef HAVE_STRUCT_UTMPX_UT_SYSLEN])
++m4trace:configure.in:405: -1- AC_CHECK_TYPES([int8_t, int16_t, int32_t, int64_t, 
++	u_int8_t, u_int16_t, u_int32_t, u_int64_t,
++	uint8_t, uint16_t, uint32_t, uint64_t], [], [], [
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_BITYPES_H
++#include <sys/bitypes.h>
++#endif
++#ifdef HAVE_BIND_BITYPES_H
++#include <bind/bitypes.h>
++#endif
++#ifdef HAVE_NETINET_IN6_MACHTYPES_H
++#include <netinet/in6_machtypes.h>
++#endif
++])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT8_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_INT8_T], [/* Define to 1 if the system has the type `int8_t\'. */
++#undef HAVE_INT8_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT16_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_INT16_T], [/* Define to 1 if the system has the type `int16_t\'. */
++#undef HAVE_INT16_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT32_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_INT32_T], [/* Define to 1 if the system has the type `int32_t\'. */
++#undef HAVE_INT32_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INT64_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_INT64_T], [/* Define to 1 if the system has the type `int64_t\'. */
++#undef HAVE_INT64_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT8_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_U_INT8_T], [/* Define to 1 if the system has the type `u_int8_t\'. */
++#undef HAVE_U_INT8_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT16_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_U_INT16_T], [/* Define to 1 if the system has the type `u_int16_t\'. */
++#undef HAVE_U_INT16_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT32_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_U_INT32_T], [/* Define to 1 if the system has the type `u_int32_t\'. */
++#undef HAVE_U_INT32_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_U_INT64_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_U_INT64_T], [/* Define to 1 if the system has the type `u_int64_t\'. */
++#undef HAVE_U_INT64_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT8_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_UINT8_T], [/* Define to 1 if the system has the type `uint8_t\'. */
++#undef HAVE_UINT8_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT16_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_UINT16_T], [/* Define to 1 if the system has the type `uint16_t\'. */
++#undef HAVE_UINT16_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT32_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_UINT32_T], [/* Define to 1 if the system has the type `uint32_t\'. */
++#undef HAVE_UINT32_T])
++m4trace:configure.in:405: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UINT64_T])
++m4trace:configure.in:405: -1- AH_OUTPUT([HAVE_UINT64_T], [/* Define to 1 if the system has the type `uint64_t\'. */
++#undef HAVE_UINT64_T])
++m4trace:configure.in:407: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++aclocal.m4:7232: AC_FIND_FUNC_NO_LIBS2 is expanded from...
++aclocal.m4:7168: AC_FIND_FUNC_NO_LIBS is expanded from...
++aclocal.m4:9539: KRB_READLINE is expanded from...
++configure.in:407: the top level])
++m4trace:configure.in:407: -1- AC_CHECK_FUNCS([el_init])
++m4trace:configure.in:407: -1- AH_OUTPUT([HAVE_EL_INIT], [/* Define to 1 if you have the `el_init\' function. */
++#undef HAVE_EL_INIT])
++m4trace:configure.in:407: -1- AC_SUBST([LIB_el_init])
++m4trace:configure.in:407: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:9539: KRB_READLINE is expanded from...
++configure.in:407: the top level])
++m4trace:configure.in:407: -1- AC_DEFINE_TRACE_LITERAL([HAVE_FOUR_VALUED_EL_INIT])
++m4trace:configure.in:407: -1- AH_OUTPUT([HAVE_FOUR_VALUED_EL_INIT], [/* Define if el_init takes four arguments. */
++#undef HAVE_FOUR_VALUED_EL_INIT])
++m4trace:configure.in:407: -1- AM_CONDITIONAL([el_compat], [test "$ac_foo" = yes])
++m4trace:configure.in:407: -1- AC_SUBST([el_compat_TRUE])
++m4trace:configure.in:407: -1- AC_SUBST([el_compat_FALSE])
++m4trace:configure.in:407: -1- AC_DEFINE_TRACE_LITERAL([HAVE_READLINE])
++m4trace:configure.in:407: -1- AH_OUTPUT([HAVE_READLINE], [/* Define if you have a readline compatible library. */
++#undef HAVE_READLINE])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([AUTHENTICATION])
++m4trace:configure.in:409: -1- AH_OUTPUT([AUTHENTICATION], [/* Define if you want authentication support in telnet. */
++#undef AUTHENTICATION])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([ENCRYPTION])
++m4trace:configure.in:409: -1- AH_OUTPUT([ENCRYPTION], [/* Define if you want encryption support in telnet. */
++#undef ENCRYPTION])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([DES_ENCRYPTION])
++m4trace:configure.in:409: -1- AH_OUTPUT([DES_ENCRYPTION], [/* Define if you want to use DES encryption in telnet. */
++#undef DES_ENCRYPTION])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([DIAGNOSTICS])
++m4trace:configure.in:409: -1- AH_OUTPUT([DIAGNOSTICS], [/* Define this to enable diagnostics in telnet. */
++#undef DIAGNOSTICS])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([OLD_ENVIRON])
++m4trace:configure.in:409: -1- AH_OUTPUT([OLD_ENVIRON], [/* Define this to enable old environment option in telnet. */
++#undef OLD_ENVIRON])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([ENV_HACK])
++m4trace:configure.in:409: -1- AH_OUTPUT([ENV_HACK], [/* Define this if you want support for broken ENV_{VAR,VAL} telnets. */
++#undef ENV_HACK])
++m4trace:configure.in:409: -2- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:9618: rk_TELNET is expanded from...
++configure.in:409: the top level])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETMSG])
++m4trace:configure.in:409: -1- AH_OUTPUT([HAVE_GETMSG], [/* Define if you have a working getmsg. */
++#undef HAVE_GETMSG])
++m4trace:configure.in:409: -1- AC_DEFINE_TRACE_LITERAL([STREAMSPTY])
++m4trace:configure.in:409: -1- AH_OUTPUT([STREAMSPTY], [/* Define if you have streams ptys. */
++#undef STREAMSPTY])
++m4trace:configure.in:409: -1- AH_OUTPUT([zzzz10], [
++#if defined(ENCRYPTION) && !defined(AUTHENTICATION)
++#define AUTHENTICATION 1
++#endif
++
++/* Set this to the default system lead string for telnetd 
++ * can contain %-escapes: %s=sysname, %m=machine, %r=os-release
++ * %v=os-version, %t=tty, %h=hostname, %d=date and time
++ */
++#undef USE_IM
++
++/* Used with login -p */
++#undef LOGIN_ARGS
++
++/* set this to a sensible login */
++#ifndef LOGIN_PATH
++#define LOGIN_PATH BINDIR "/login"
++#endif
++])
++m4trace:configure.in:412: -1- AC_SUBST([COMPILE_ET])
++m4trace:configure.in:412: -1- _m4_warn([obsolete], [The macro `AC_TRY_RUN' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:9712: CHECK_COMPILE_ET is expanded from...
++configure.in:412: the top level])
++m4trace:configure.in:412: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:2289: AC_TRY_RUN is expanded from...
++aclocal.m4:9712: CHECK_COMPILE_ET is expanded from...
++configure.in:412: the top level])
++m4trace:configure.in:412: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++aclocal.m4:9712: CHECK_COMPILE_ET is expanded from...
++configure.in:412: the top level])
++m4trace:configure.in:412: -1- AC_SUBST([DIR_com_err])
++m4trace:configure.in:412: -1- AC_SUBST([LIB_com_err])
++m4trace:configure.in:412: -1- AC_SUBST([LIB_com_err_a])
++m4trace:configure.in:412: -1- AC_SUBST([LIB_com_err_so])
++m4trace:configure.in:414: -1- AC_SUBST([LIB_AUTH_SUBDIRS])
++m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([BINDIR])
++m4trace:configure.in:416: -1- AH_OUTPUT([BINDIR], [/* path to bin */
++#undef BINDIR])
++m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([LIBDIR])
++m4trace:configure.in:416: -1- AH_OUTPUT([LIBDIR], [/* path to lib */
++#undef LIBDIR])
++m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([LIBEXECDIR])
++m4trace:configure.in:416: -1- AH_OUTPUT([LIBEXECDIR], [/* path to libexec */
++#undef LIBEXECDIR])
++m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([LOCALSTATEDIR])
++m4trace:configure.in:416: -1- AH_OUTPUT([LOCALSTATEDIR], [/* path to localstate */
++#undef LOCALSTATEDIR])
++m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([SBINDIR])
++m4trace:configure.in:416: -1- AH_OUTPUT([SBINDIR], [/* path to sbin */
++#undef SBINDIR])
++m4trace:configure.in:416: -1- AC_DEFINE_TRACE_LITERAL([SYSCONFDIR])
++m4trace:configure.in:416: -1- AH_OUTPUT([SYSCONFDIR], [/* path to sysconf */
++#undef SYSCONFDIR])
++m4trace:configure.in:420: -1- AC_SUBST([LTLIBOBJS])
++m4trace:configure.in:424: -1- AH_OUTPUT([zzzz11], [#ifdef ROKEN_RENAME
++#include "roken_rename.h"
++#endif])
++m4trace:configure.in:478: -1- AC_CONFIG_FILES([Makefile 		\
++	include/Makefile		\
++	include/kadm5/Makefile		\
++	lib/Makefile			\
++	lib/45/Makefile			\
++	lib/auth/Makefile		\
++	lib/auth/afskauthlib/Makefile	\
++	lib/auth/pam/Makefile		\
++	lib/auth/sia/Makefile		\
++	lib/asn1/Makefile		\
++	lib/com_err/Makefile		\
++	lib/des/Makefile		\
++	lib/editline/Makefile		\
++	lib/gssapi/Makefile		\
++	lib/hdb/Makefile		\
++	lib/kadm5/Makefile		\
++	lib/kafs/Makefile		\
++	lib/kdfs/Makefile		\
++	lib/krb5/Makefile		\
++	lib/otp/Makefile		\
++	lib/roken/Makefile		\
++	lib/sl/Makefile			\
++	lib/vers/Makefile		\
++	kuser/Makefile			\
++	kpasswd/Makefile		\
++	kadmin/Makefile			\
++	admin/Makefile			\
++	kdc/Makefile			\
++	appl/Makefile			\
++	appl/afsutil/Makefile		\
++	appl/ftp/Makefile		\
++	appl/ftp/common/Makefile	\
++	appl/ftp/ftp/Makefile		\
++	appl/ftp/ftpd/Makefile		\
++	appl/kx/Makefile		\
++	appl/login/Makefile		\
++	appl/otp/Makefile		\
++	appl/popper/Makefile		\
++	appl/push/Makefile		\
++	appl/rsh/Makefile		\
++	appl/rcp/Makefile		\
++	appl/su/Makefile		\
++	appl/xnlock/Makefile		\
++	appl/telnet/Makefile		\
++	appl/telnet/libtelnet/Makefile	\
++	appl/telnet/telnet/Makefile	\
++	appl/telnet/telnetd/Makefile	\
++	appl/test/Makefile		\
++	appl/kf/Makefile		\
++	appl/dceutils/Makefile		\
++	doc/Makefile			\
++	tools/Makefile			\
++])
++m4trace:configure.in:480: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
++m4trace:configure.in:480: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+diff -ruN heimdal-0.6.3-old/config.guess heimdal-0.6.3/config.guess
+--- heimdal-0.6.3-old/config.guess	2004-09-13 22:28:49.000000000 +1000
++++ heimdal-0.6.3/config.guess	2004-09-14 08:39:38.000000000 +1000
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+-timestamp='2004-03-03'
++timestamp='2004-03-12'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -853,6 +853,9 @@
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+diff -ruN heimdal-0.6.3-old/config.sub heimdal-0.6.3/config.sub
+--- heimdal-0.6.3-old/config.sub	2004-09-13 22:28:49.000000000 +1000
++++ heimdal-0.6.3/config.sub	2004-09-14 08:39:38.000000000 +1000
+@@ -3,7 +3,7 @@
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 
+-timestamp='2004-02-23'
++timestamp='2004-03-12'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -237,7 +237,7 @@
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m68000 | m68k | m88k | mcore \
++	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+@@ -262,7 +262,7 @@
+ 	| pyramid \
+ 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
++	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ 	| strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+@@ -308,7 +308,7 @@
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* \
++	| m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+@@ -336,7 +336,7 @@
+ 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+@@ -1081,7 +1081,7 @@
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+-	sparc | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+diff -ruN heimdal-0.6.3-old/configure heimdal-0.6.3/configure
+--- heimdal-0.6.3-old/configure	2004-09-13 22:27:10.000000000 +1000
++++ heimdal-0.6.3/configure	2004-09-14 08:38:51.000000000 +1000
+@@ -467,7 +467,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CANONICAL_HOST YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT INCLUDE_openldap LIB_openldap INCLUDE_krb4 LIB_krb4 EXTRA_LIB45 LIB_krb_enable_debug LIB_krb_disable_debug LIB_krb_get_our_ip_for_realm LIB_krb_kdctimeofday LIB_krb_get_kdc_time_diff KRB4_TRUE KRB4_FALSE KRB5_TRUE KRB5_FALSE do_roken_rename_TRUE do_roken_rename_FALSE LIB_kdb HAVE_OPENSSL_TRUE HAVE_OPENSSL_FALSE DIR_des INCLUDE_des LIB_des LIB_des_a LIB_des_so LIB_des_appl DCE_TRUE DCE_FALSE dpagaix_cflags dpagaix_ldadd dpagaix_ldflags LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM VOID_RETSIGTYPE have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIBOBJS have_glob_h_TRUE have_glob_h_FALSE LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror LIB_crypt DIR_roken LIB_roken INCLUDES_roken LIB_otp OTP_TRUE OTP_FALSE LIB_security NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT INCLUDE_readline LIB_readline INCLUDE_hesiod LIB_hesiod AIX_TRUE AIX_FALSE AIX4_TRUE AIX4_FALSE LIB_dlopen HAVE_DLOPEN_TRUE HAVE_DLOPEN_FALSE LIB_loadquery AIX_DYNAMIC_AFS_TRUE AIX_DYNAMIC_AFS_FALSE AIX_EXTRA_KAFS IRIX_TRUE IRIX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X_TRUE HAVE_X_FALSE LIB_XauWriteAuth LIB_XauReadAuth LIB_XauFileName NEED_WRITEAUTH_TRUE NEED_WRITEAUTH_FALSE LIB_logwtmp LIB_logout LIB_openpty LIB_tgetent LIB_getpwnam_r LIB_el_init el_compat_TRUE el_compat_FALSE COMPILE_ET DIR_com_err LIB_com_err LIB_com_err_a LIB_com_err_so LIB_AUTH_SUBDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CANONICAL_HOST YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WFLAGS WFLAGS_NOUNUSED WFLAGS_NOIMPLICITINT DIR_openldap INCLUDE_openldap LIB_openldap DIR_krb4 INCLUDE_krb4 LIB_krb4 EXTRA_LIB45 LIB_krb_enable_debug LIB_krb_disable_debug LIB_krb_get_our_ip_for_realm LIB_krb_kdctimeofday LIB_krb_get_kdc_time_diff KRB4_TRUE KRB4_FALSE KRB5_TRUE KRB5_FALSE do_roken_rename_TRUE do_roken_rename_FALSE LIB_kdb HAVE_OPENSSL_TRUE HAVE_OPENSSL_FALSE DIR_des INCLUDE_des LIB_des LIB_des_a LIB_des_so LIB_des_appl DCE_TRUE DCE_FALSE dpagaix_cflags dpagaix_ldadd dpagaix_ldflags LIB_db_create LIB_dbopen LIB_dbm_firstkey HAVE_DB1_TRUE HAVE_DB1_FALSE HAVE_DB3_TRUE HAVE_DB3_FALSE HAVE_NDBM_TRUE HAVE_NDBM_FALSE DBLIB LIB_NDBM LIB_crypt LIB_roken DIR_roken CPPFLAGS_roken VOID_RETSIGTYPE have_err_h_TRUE have_err_h_FALSE have_fnmatch_h_TRUE have_fnmatch_h_FALSE have_ifaddrs_h_TRUE have_ifaddrs_h_FALSE have_vis_h_TRUE have_vis_h_FALSE LIB_socket LIB_gethostbyname LIB_syslog LIB_gethostbyname2 LIB_res_search LIB_res_nsearch LIB_dn_expand LIBOBJS have_glob_h_TRUE have_glob_h_FALSE LIB_getsockopt LIB_setsockopt LIB_hstrerror LIB_bswap16 LIB_bswap32 LIB_pidfile LIB_getaddrinfo LIB_getnameinfo LIB_freeaddrinfo LIB_gai_strerror OTP_TRUE OTP_FALSE LIB_security NROFF GROFF CATMAN CATMAN_TRUE CATMAN_FALSE CATMANEXT DIR_readline INCLUDE_readline LIB_readline DIR_hesiod INCLUDE_hesiod LIB_hesiod DIR_sl INCLUDE_sl LIB_sl DIR_ss INCLUDE_ss LIB_ss DIR_otp INCLUDE_otp LIB_otp AIX_TRUE AIX_FALSE AIX4_TRUE AIX4_FALSE LIB_dlopen HAVE_DLOPEN_TRUE HAVE_DLOPEN_FALSE LIB_loadquery AIX_DYNAMIC_AFS_TRUE AIX_DYNAMIC_AFS_FALSE AIX_EXTRA_KAFS IRIX_TRUE IRIX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAVE_X_TRUE HAVE_X_FALSE LIB_XauWriteAuth LIB_XauReadAuth LIB_XauFileName NEED_WRITEAUTH_TRUE NEED_WRITEAUTH_FALSE LIB_logwtmp LIB_logout LIB_openpty LIB_tgetent LIB_getpwnam_r LIB_el_init el_compat_TRUE el_compat_FALSE COMPILE_ET DIR_com_err LIB_com_err LIB_com_err_a LIB_com_err_so LIB_AUTH_SUBDIRS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -1033,8 +1033,8 @@
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --enable-maintainer-mode  enable make rules and dependencies not useful
+-			  (and sometimes confusing) to the casual installer
++  --enable-maintainer-mode enable make rules and dependencies not useful
++                          (and sometimes confusing) to the casual installer
+   --disable-largefile     omit support for large files
+   --enable-shared[=PKGS]
+                           build shared libraries [default=no]
+@@ -1076,6 +1076,7 @@
+   --with-openssl-lib=dir  use openssl libraries in dir
+   --with-openssl-include=dir
+                           use openssl headers in dir
++  --with-roken=dir        use the roken library in dir
+   --without-ipv6          do not enable IPv6 support
+   --with-readline=dir     use readline in dir
+   --with-readline-lib=dir use readline libraries in dir
+@@ -1089,6 +1090,18 @@
+                           use hesiod headers in dir
+   --with-hesiod-config=path
+                           config program for hesiod
++  --with-sl=dir           use sl in dir
++  --with-sl-lib=dir       use sl libraries in dir
++  --with-sl-include=dir   use sl headers in dir
++  --with-sl-config=path   config program for sl
++  --with-ss=dir           use ss in dir
++  --with-ss-lib=dir       use ss libraries in dir
++  --with-ss-include=dir   use ss headers in dir
++  --with-ss-config=path   config program for ss
++  --with-otp=dir          use otp in dir
++  --with-otp-lib=dir      use otp libraries in dir
++  --with-otp-include=dir  use otp headers in dir
++  --with-otp-config=path  config program for otp
+   --with-x                use the X Window System
+ 
+ Some influential environment variables:
+@@ -1197,7 +1210,7 @@
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+-    cd $ac_popdir
++    cd "$ac_popdir"
+   done
+ fi
+ 
+@@ -1554,6 +1567,30 @@
+ 
+ 
+ 
++echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
++    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi;
++  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
++
++
++if test $USE_MAINTAINER_MODE = yes; then
++  MAINTAINER_MODE_TRUE=
++  MAINTAINER_MODE_FALSE='#'
++else
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++
++
+ 
+           ac_config_headers="$ac_config_headers include/config.h"
+ 
+@@ -2126,8 +2163,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2185,8 +2221,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2302,8 +2337,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2357,8 +2391,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2403,8 +2436,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2448,8 +2480,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2724,7 +2755,7 @@
+ 
+ 
+ 
+-am__api_version="1.8"
++am__api_version="1.7"
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then
+@@ -2887,6 +2918,7 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+ 
++
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+@@ -2900,31 +2932,6 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # Keeping the `.' argument allows $(mkdir_p) to be used without
+-  # argument.  Indeed, we sometimes output rules like
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.
+-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+-  # expensive solution, as it forces Make to start a sub-shell.)
+-  mkdir_p='mkdir -p -- .'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
+-  else
+-    mkdir_p='$(install_sh) -d'
+-  fi
+-fi
+-
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -3003,7 +3010,7 @@
+ fi
+ rmdir .tst 2>/dev/null
+ 
+-# test to see if srcdir already configured
++ # test to see if srcdir already configured
+ if test "`cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+@@ -3287,8 +3294,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3317,8 +3323,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3388,8 +3393,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3441,8 +3445,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3513,8 +3516,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3566,8 +3568,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3736,8 +3737,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3803,8 +3803,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3893,8 +3892,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4062,8 +4060,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4120,8 +4117,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4225,8 +4221,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4618,14 +4613,14 @@
+   ;;
+ 
+ cygwin*)
+-  # win32_libid is a shell function defined in ltmain.sh
++  # func_win32_libid is a shell function defined in ltmain.sh
+   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_file_magic_cmd='win32_libid'
++  lt_cv_file_magic_cmd='func_win32_libid'
+   ;;
+ 
+ mingw* | pw32*)
+   # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # win32_libid shell function, so use a weaker test based on 'objdump'.
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+   lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+@@ -4684,19 +4679,10 @@
+ 
+ # This must be Linux ELF.
+ linux*)
+-  case $host_cpu in
+-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*)
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -4810,7 +4796,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 4813 "configure"' > conftest.$ac_ext
++  echo '#line 4799 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -4930,8 +4916,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5006,8 +4991,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5177,8 +5161,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5245,8 +5228,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5506,8 +5488,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5565,8 +5546,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5637,8 +5617,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5682,8 +5661,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6039,7 +6017,7 @@
+ 
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:6042:" \
++echo "$as_me:6020:" \
+      "checking for Fortran 77 compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+@@ -6085,8 +6063,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6135,8 +6112,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6194,7 +6170,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     i=0
+-  testring="ABCD"
++  teststring="ABCD"
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -6233,16 +6209,16 @@
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
++    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
++      teststring=$teststring$teststring
+     done
+-    testring=
++    teststring=
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -7073,11 +7049,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7076: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7052: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7080: \$? = $ac_status" >&5
++   echo "$as_me:7056: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -7306,11 +7282,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7309: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7285: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7313: \$? = $ac_status" >&5
++   echo "$as_me:7289: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -7366,11 +7342,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7369: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7345: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7373: \$? = $ac_status" >&5
++   echo "$as_me:7349: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -7543,7 +7519,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -7582,7 +7558,7 @@
+       ;;
+ 
+   linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	archive_cmds="$tmp_archive_cmds"
+       supports_anon_versioning=no
+@@ -7601,6 +7577,7 @@
+       else
+         archive_expsym_cmds="$tmp_archive_cmds"
+       fi
++      link_all_deplibs=no
+     else
+       ld_shlibs=no
+     fi
+@@ -7757,8 +7734,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7818,8 +7794,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7884,7 +7859,7 @@
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+       archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+@@ -8062,7 +8037,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -8340,7 +8315,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -8453,7 +8428,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -8518,7 +8493,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -8601,7 +8576,7 @@
+   need_version=no
+   case "$host_cpu" in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -8616,7 +8591,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -8627,7 +8602,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -8698,8 +8673,8 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -8711,6 +8686,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ knetbsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -8781,7 +8768,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -9010,8 +8997,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9114,8 +9100,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9180,8 +9165,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9274,8 +9258,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9340,8 +9323,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9407,8 +9389,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9474,8 +9455,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9550,7 +9530,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 9553 "configure"
++#line 9533 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -9648,7 +9628,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 9651 "configure"
++#line 9631 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -9773,7 +9753,7 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -10049,7 +10029,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -10720,8 +10700,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10782,8 +10761,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -10964,7 +10942,7 @@
+       # explicitly linking system object files so we need to strip them
+       # from the output so that they don't get included in the library
+       # dependencies.
+-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+       ;;
+     *)
+       if test "$GXX" = yes; then
+@@ -11161,7 +11139,7 @@
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+@@ -11716,7 +11694,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -11827,11 +11805,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11830: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11808: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:11834: \$? = $ac_status" >&5
++   echo "$as_me:11812: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -11887,11 +11865,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:11890: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11868: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:11894: \$? = $ac_status" >&5
++   echo "$as_me:11872: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -11957,6 +11935,9 @@
+   cygwin* | mingw*)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux*)
++    link_all_deplibs_CXX=no
++  ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -12038,7 +12019,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -12151,7 +12132,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -12216,7 +12197,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -12299,7 +12280,7 @@
+   need_version=no
+   case "$host_cpu" in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -12314,7 +12295,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -12325,7 +12306,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -12396,8 +12377,8 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -12409,6 +12390,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ knetbsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -12479,7 +12472,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -12708,8 +12701,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12812,8 +12804,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12878,8 +12869,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -12972,8 +12962,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13038,8 +13027,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13105,8 +13093,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13172,8 +13159,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -13248,7 +13234,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 13251 "configure"
++#line 13237 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13346,7 +13332,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 13349 "configure"
++#line 13335 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13625,7 +13611,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -13947,7 +13933,7 @@
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4*)
++aix4* | aix5*)
+   test "$enable_shared" = yes && enable_static=no
+   ;;
+ esac
+@@ -14173,11 +14159,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14176: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14162: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14180: \$? = $ac_status" >&5
++   echo "$as_me:14166: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -14233,11 +14219,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14236: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14222: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14240: \$? = $ac_status" >&5
++   echo "$as_me:14226: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14410,7 +14396,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -14449,7 +14435,7 @@
+       ;;
+ 
+   linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	archive_cmds_F77="$tmp_archive_cmds"
+       supports_anon_versioning=no
+@@ -14468,6 +14454,7 @@
+       else
+         archive_expsym_cmds_F77="$tmp_archive_cmds"
+       fi
++      link_all_deplibs_F77=no
+     else
+       ld_shlibs_F77=no
+     fi
+@@ -14614,8 +14601,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14665,8 +14651,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -14731,7 +14716,7 @@
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+       archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+@@ -14909,7 +14894,7 @@
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -15187,7 +15172,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -15300,7 +15285,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -15365,7 +15350,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -15448,7 +15433,7 @@
+   need_version=no
+   case "$host_cpu" in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -15463,7 +15448,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -15474,7 +15459,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -15545,8 +15530,8 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -15558,6 +15543,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ knetbsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -15628,7 +15625,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -15969,7 +15966,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -16267,11 +16264,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16270: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16267: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16274: \$? = $ac_status" >&5
++   echo "$as_me:16271: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -16500,11 +16497,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16503: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16500: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16507: \$? = $ac_status" >&5
++   echo "$as_me:16504: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings
+@@ -16560,11 +16557,11 @@
+    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:16563: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16560: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16567: \$? = $ac_status" >&5
++   echo "$as_me:16564: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -16737,7 +16734,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -16776,7 +16773,7 @@
+       ;;
+ 
+   linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+         tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	archive_cmds_GCJ="$tmp_archive_cmds"
+       supports_anon_versioning=no
+@@ -16795,6 +16792,7 @@
+       else
+         archive_expsym_cmds_GCJ="$tmp_archive_cmds"
+       fi
++      link_all_deplibs_GCJ=no
+     else
+       ld_shlibs_GCJ=no
+     fi
+@@ -16951,8 +16949,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -17012,8 +17009,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -17078,7 +17074,7 @@
+       # Tell ltmain to make .lib files, not .a files.
+       libext=lib
+       # Tell ltmain to make .dll files, not .so files.
+-      shrext=".dll"
++      shrext_cmds=".dll"
+       # FIXME: Setting linknames here is a bad hack.
+       archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+       # The linker will automatically build a .lib file if we build a DLL.
+@@ -17256,7 +17252,7 @@
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -17534,7 +17530,7 @@
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -17647,7 +17643,7 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
+ 
+@@ -17712,7 +17708,7 @@
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+@@ -17795,7 +17791,7 @@
+   need_version=no
+   case "$host_cpu" in
+   ia64*)
+-    shrext='.so'
++    shrext_cmds='.so'
+     hardcode_into_libs=yes
+     dynamic_linker="$host_os dld.so"
+     shlibpath_var=LD_LIBRARY_PATH
+@@ -17810,7 +17806,7 @@
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+    hppa*64*)
+-     shrext='.sl'
++     shrext_cmds='.sl'
+      hardcode_into_libs=yes
+      dynamic_linker="$host_os dld.sl"
+      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -17821,7 +17817,7 @@
+      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+      ;;
+    *)
+-    shrext='.sl'
++    shrext_cmds='.sl'
+     dynamic_linker="$host_os dld.sl"
+     shlibpath_var=SHLIB_PATH
+     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -17892,8 +17888,8 @@
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
+-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -17905,6 +17901,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ knetbsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+@@ -17975,7 +17983,7 @@
+ 
+ os2*)
+   libname_spec='$name'
+-  shrext=".dll"
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+@@ -18204,8 +18212,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18308,8 +18315,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18374,8 +18380,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18468,8 +18473,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18534,8 +18538,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18601,8 +18604,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18668,8 +18670,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -18744,7 +18745,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 18747 "configure"
++#line 18748 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -18842,7 +18843,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 18845 "configure"
++#line 18846 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -19121,7 +19122,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -19566,7 +19567,7 @@
+ libext="$libext"
+ 
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+ 
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -19923,7 +19924,7 @@
+ 
+ header_dirs=
+ lib_dirs=
+-for i in $d; do
++for i in $d /usr; do
+ 	if test "$with_openldap_include" = ""; then
+ 		if test -d "$i/include/openldap"; then
+ 			header_dirs="$header_dirs $i/include/openldap"
+@@ -19994,8 +19995,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20050,8 +20050,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20098,8 +20097,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20121,6 +20119,7 @@
+       conftest$ac_exeext conftest.$ac_ext
+ 		done
+ 		if test "$ires" -a "$lres" -a "$with_openldap" != "no"; then
++			DIR_openldap=
+ 			INCLUDE_openldap="-I$ires"
+ 			LIB_openldap="-L$lres -lldap -llber "
+ 			found=yes
+@@ -20141,6 +20140,7 @@
+ 	with_openldap=yes
+ else
+ 	with_openldap=no
++	DIR_openldap=
+ 	INCLUDE_openldap=
+ 	LIB_openldap=
+ 	echo "$as_me:$LINENO: result: no" >&5
+@@ -20153,6 +20153,7 @@
+ 
+ 
+ 
++
+ # Check whether --with-krb4 or --without-krb4 was given.
+ if test "${with_krb4+set}" = set; then
+   withval="$with_krb4"
+@@ -20202,7 +20203,7 @@
+ 
+ header_dirs=
+ lib_dirs=
+-for i in $d; do
++for i in $d /usr; do
+ 	if test "$with_krb4_include" = ""; then
+ 		if test -d "$i/include/krb4"; then
+ 			header_dirs="$header_dirs $i/include/krb4"
+@@ -20272,8 +20273,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20327,8 +20327,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20374,8 +20373,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20397,6 +20395,7 @@
+       conftest$ac_exeext conftest.$ac_ext
+ 		done
+ 		if test "$ires" -a "$lres" -a "$with_krb4" != "no"; then
++			DIR_krb4=
+ 			INCLUDE_krb4="-I$ires"
+ 			LIB_krb4="-L$lres -lkrb -ldes"
+ 			found=yes
+@@ -20417,6 +20416,7 @@
+ 	with_krb4=yes
+ else
+ 	with_krb4=no
++	DIR_krb4=
+ 	INCLUDE_krb4=
+ 	LIB_krb4=
+ 	echo "$as_me:$LINENO: result: no" >&5
+@@ -20427,6 +20427,7 @@
+ 
+ 
+ 
++
+ LIB_kdb=
+ if test "$with_krb4" != "no"; then
+ 	save_CFLAGS="$CFLAGS"
+@@ -20466,8 +20467,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20530,8 +20530,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20597,8 +20596,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20674,8 +20672,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20775,8 +20772,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20897,8 +20893,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -20998,8 +20993,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21120,8 +21114,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21221,8 +21214,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21343,8 +21335,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21444,8 +21435,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21568,8 +21558,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21669,8 +21658,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21779,8 +21767,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -21843,8 +21830,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22061,8 +22047,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22157,8 +22142,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22253,8 +22237,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22380,8 +22363,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22560,8 +22542,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22731,8 +22712,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22832,8 +22812,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -22976,8 +22955,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23077,8 +23055,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23216,8 +23193,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23317,8 +23293,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23455,8 +23430,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23624,8 +23598,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23725,8 +23698,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -23855,8 +23827,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24020,8 +23991,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24121,8 +24091,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24317,8 +24286,6 @@
+   HAVE_NDBM_FALSE=
+ fi
+ 
+-## it's probably not correct to include LDFLAGS here, but we might
+-## need it, for now just add any possible -L
+ z=""
+ for i in $LDFLAGS; do
+ 	case "$i" in
+@@ -24331,6 +24298,311 @@
+ 
+ 
+ 
++# Check whether --with-roken or --without-roken was given.
++if test "${with_roken+set}" = set; then
++  withval="$with_roken"
++  if test "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: roken is required" >&5
++echo "$as_me: error: roken is required" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++fi;
++
++save_CPPFLAGS="${CPPFLAGS}"
++
++case $with_roken in
++yes|"")
++  dirs="/usr/heimdal /usr/athena" ;;
++*)
++  dirs="$with_roken" ;;
++esac
++
++roken_installed=no
++
++for i in $dirs; do
++
++echo "$as_me:$LINENO: checking for roken in $i" >&5
++echo $ECHO_N "checking for roken in $i... $ECHO_C" >&6
++
++CPPFLAGS="-I$i/include ${CPPFLAGS}"
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <roken.h>
++//#if ROKEN_VERSION < 10
++//#error old roken version, should be 10
++//fail
++//#endif
++
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  roken_installed=yes; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++rm -f conftest.err conftest.$ac_ext
++
++echo "$as_me:$LINENO: result: $roken_installed" >&5
++echo "${ECHO_T}$roken_installed" >&6
++
++done
++
++CPPFLAGS="$save_CPPFLAGS"
++
++if test "$roken_installed" != "yes"; then
++  DIR_roken="roken"
++  LIB_roken='$(top_builddir)/lib/roken/libroken.la'
++  CPPFLAGS_roken='-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken'
++else
++  LIB_roken="$i/lib/libroken.la"
++  CPPFLAGS_roken="-I$i/include"
++fi
++
++
++
++
++echo "$as_me:$LINENO: checking for crypt" >&5
++echo $ECHO_N "checking for crypt... $ECHO_C" >&6
++if test "${ac_cv_funclib_crypt+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++if eval "test \"\$ac_cv_func_crypt\" != yes" ; then
++	ac_save_LIBS="$LIBS"
++	for ac_lib in "" crypt; do
++		case "$ac_lib" in
++		"") ;;
++		yes) ac_lib="" ;;
++		no) continue ;;
++		-l*) ;;
++		*) ac_lib="-l$ac_lib" ;;
++		esac
++		LIBS=" $ac_lib  $ac_save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++crypt()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	done
++	eval "ac_cv_funclib_crypt=\${ac_cv_funclib_crypt-no}"
++	LIBS="$ac_save_LIBS"
++fi
++
++fi
++
++
++eval "ac_res=\$ac_cv_funclib_crypt"
++
++if false; then
++
++for ac_func in crypt
++do
++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
++echo "$as_me:$LINENO: checking for $ac_func" >&5
++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
++if eval "test \"\${$as_ac_var+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++done
++
++fi
++# crypt
++eval "ac_tr_func=HAVE_`echo crypt | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "ac_tr_lib=HAVE_LIB`echo $ac_res | sed -e 's/-l//' | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
++eval "LIB_crypt=$ac_res"
++
++case "$ac_res" in
++	yes)
++	eval "ac_cv_func_crypt=yes"
++	eval "LIB_crypt="
++	cat >>confdefs.h <<_ACEOF
++#define $ac_tr_func 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++	;;
++	no)
++	eval "ac_cv_func_crypt=no"
++	eval "LIB_crypt="
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++	;;
++	*)
++	eval "ac_cv_func_crypt=yes"
++	eval "ac_cv_lib_`echo "$ac_res" | sed 's/-l//'`=yes"
++	cat >>confdefs.h <<_ACEOF
++#define $ac_tr_func 1
++_ACEOF
++
++	cat >>confdefs.h <<_ACEOF
++#define $ac_tr_lib 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes, in $ac_res" >&5
++echo "${ECHO_T}yes, in $ac_res" >&6
++	;;
++esac
++
++LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++
++
++#if ! test "$roken_installed" = yes; then
++
++
+ echo "$as_me:$LINENO: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+@@ -24360,8 +24632,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24477,8 +24748,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24541,8 +24811,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24607,8 +24876,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24719,8 +24987,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24793,8 +25060,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -24860,8 +25126,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25072,8 +25337,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25261,8 +25525,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25354,8 +25617,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25539,8 +25801,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25814,9 +26075,6 @@
+ 
+ 
+ 
+-DIR_roken=roken
+-LIB_roken='$(top_builddir)/lib/roken/libroken.la'
+-INCLUDES_roken='-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken'
+ 
+ 
+ 
+@@ -25886,8 +26144,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -25946,8 +26203,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26026,8 +26282,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26086,8 +26341,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26257,8 +26511,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26463,8 +26716,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26564,8 +26816,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26686,8 +26937,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26787,8 +27037,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -26909,8 +27158,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27010,8 +27258,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27297,8 +27544,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27332,7 +27578,6 @@
+   CFLAGS="${save_CFLAGS}"
+ fi
+ 
+-## test for AIX missing in6addr_loopback
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 	echo "$as_me:$LINENO: checking for in6addr_loopback" >&5
+ echo $ECHO_N "checking for in6addr_loopback... $ECHO_C" >&6
+@@ -27379,8 +27624,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27459,8 +27703,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27560,8 +27803,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27697,8 +27939,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27798,8 +28039,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -27935,8 +28175,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28036,8 +28275,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28173,8 +28411,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28274,8 +28511,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28397,8 +28633,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28445,8 +28680,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28524,8 +28758,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28660,8 +28893,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28800,8 +29032,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28878,8 +29109,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -28947,8 +29177,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29125,8 +29354,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29223,8 +29451,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29324,8 +29551,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29446,8 +29672,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29547,8 +29772,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29668,8 +29892,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29769,8 +29992,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29894,8 +30116,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -29964,8 +30185,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30032,8 +30252,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30100,8 +30319,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30168,8 +30386,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30248,8 +30465,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30349,8 +30565,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30469,8 +30684,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30570,8 +30784,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30690,8 +30903,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30791,8 +31003,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -30912,8 +31123,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31013,8 +31223,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31149,8 +31358,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31250,8 +31458,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31386,8 +31593,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31487,8 +31693,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31623,8 +31828,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31724,8 +31928,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31878,8 +32081,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -31984,8 +32186,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32090,8 +32291,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32196,8 +32396,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32302,8 +32501,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32408,8 +32606,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32514,8 +32711,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32620,8 +32816,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32726,8 +32921,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32832,8 +33026,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -32938,8 +33131,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33044,8 +33236,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33150,8 +33341,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33256,8 +33446,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33362,8 +33551,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33468,8 +33656,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33574,8 +33761,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33680,8 +33866,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33786,8 +33971,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33892,8 +34076,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -33998,8 +34181,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34104,8 +34286,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34210,8 +34391,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34316,8 +34496,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34422,8 +34601,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34528,8 +34706,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34634,8 +34811,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34740,8 +34916,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34846,8 +35021,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -34952,8 +35126,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35058,8 +35231,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35164,8 +35336,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35270,8 +35441,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35376,8 +35546,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35482,8 +35651,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35588,8 +35756,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35694,8 +35861,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35800,8 +35966,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -35906,8 +36071,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36012,8 +36176,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36118,8 +36281,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36224,8 +36386,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36330,8 +36491,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36436,8 +36596,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36542,8 +36701,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36648,8 +36806,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36754,8 +36911,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36860,8 +37016,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -36966,8 +37121,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37072,8 +37226,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37178,8 +37331,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37284,8 +37436,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37390,8 +37541,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37496,8 +37646,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37602,8 +37751,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37708,8 +37856,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37814,8 +37961,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -37920,8 +38066,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38026,8 +38171,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38132,8 +38276,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38238,8 +38381,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38344,8 +38486,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38450,8 +38591,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38556,8 +38696,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38662,8 +38801,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38768,8 +38906,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38845,8 +38982,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38911,8 +39047,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -38977,8 +39112,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39047,8 +39181,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39115,8 +39248,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39183,8 +39315,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39251,8 +39382,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39319,8 +39449,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39387,8 +39516,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39455,8 +39583,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39538,8 +39665,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39632,8 +39758,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39726,8 +39851,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -39804,8 +39928,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40038,8 +40161,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40105,8 +40227,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40172,8 +40293,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40239,8 +40359,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40306,8 +40425,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40386,8 +40504,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40464,8 +40581,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40565,8 +40681,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40687,8 +40802,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40768,8 +40882,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40849,8 +40962,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40921,8 +41033,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -40990,8 +41101,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41066,8 +41176,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41139,8 +41248,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41187,8 +41295,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41259,8 +41366,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41335,8 +41441,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41383,8 +41488,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41452,8 +41556,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41528,8 +41631,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41576,8 +41678,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41645,8 +41746,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41721,8 +41821,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41769,8 +41868,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41838,8 +41936,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41914,8 +42011,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -41987,8 +42083,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42060,8 +42155,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42133,8 +42227,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42204,8 +42297,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42276,8 +42368,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42343,8 +42434,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42413,8 +42503,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42461,8 +42550,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42528,8 +42616,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42601,8 +42688,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42649,8 +42735,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42716,8 +42801,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42794,8 +42878,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42854,8 +42937,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42932,8 +43014,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -42992,8 +43073,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43070,8 +43150,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43130,8 +43209,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43208,8 +43286,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43268,8 +43345,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43346,8 +43422,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43406,8 +43481,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43484,8 +43558,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43544,8 +43617,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43625,8 +43697,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43685,8 +43756,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43766,8 +43836,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43826,8 +43895,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -43980,8 +44048,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44017,9 +44084,9 @@
+ 
+ 
+ 
+-LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+ 
++#fi
+ LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken"
+ 
+ 
+@@ -44046,8 +44113,6 @@
+ #define OTP 1
+ _ACEOF
+ 
+-	LIB_otp='$(top_builddir)/lib/otp/libotp.la'
+-
+ fi
+ echo "$as_me:$LINENO: checking whether to enable OTP library" >&5
+ echo $ECHO_N "checking whether to enable OTP library... $ECHO_C" >&6
+@@ -44299,7 +44364,7 @@
+ 
+ header_dirs=
+ lib_dirs=
+-for i in $d; do
++for i in $d /usr; do
+ 	if test "$with_readline_include" = ""; then
+ 		if test -d "$i/include/readline"; then
+ 			header_dirs="$header_dirs $i/include/readline"
+@@ -44370,8 +44435,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44426,8 +44490,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44474,8 +44537,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44497,6 +44559,7 @@
+       conftest$ac_exeext conftest.$ac_ext
+ 		done
+ 		if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
++			DIR_readline=
+ 			INCLUDE_readline="-I$ires"
+ 			LIB_readline="-L$lres -lreadline "
+ 			found=yes
+@@ -44517,6 +44580,7 @@
+ 	with_readline=yes
+ else
+ 	with_readline=no
++	DIR_readline=
+ 	INCLUDE_readline=
+ 	LIB_readline=
+ 	echo "$as_me:$LINENO: result: no" >&5
+@@ -44529,6 +44593,7 @@
+ 
+ 
+ 
++
+ # Check whether --with-hesiod or --without-hesiod was given.
+ if test "${with_hesiod+set}" = set; then
+   withval="$with_hesiod"
+@@ -44578,7 +44643,7 @@
+ 
+ header_dirs=
+ lib_dirs=
+-for i in $d; do
++for i in $d /usr; do
+ 	if test "$with_hesiod_include" = ""; then
+ 		if test -d "$i/include/hesiod"; then
+ 			header_dirs="$header_dirs $i/include/hesiod"
+@@ -44648,8 +44713,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44703,8 +44767,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44750,8 +44813,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44773,6 +44835,7 @@
+       conftest$ac_exeext conftest.$ac_ext
+ 		done
+ 		if test "$ires" -a "$lres" -a "$with_hesiod" != "no"; then
++			DIR_hesiod=
+ 			INCLUDE_hesiod="-I$ires"
+ 			LIB_hesiod="-L$lres -lhesiod "
+ 			found=yes
+@@ -44793,6 +44856,7 @@
+ 	with_hesiod=yes
+ else
+ 	with_hesiod=no
++	DIR_hesiod=
+ 	INCLUDE_hesiod=
+ 	LIB_hesiod=
+ 	echo "$as_me:$LINENO: result: no" >&5
+@@ -44804,97 +44868,168 @@
+ 
+ 
+ 
+-# Check whether --enable-bigendian or --disable-bigendian was given.
+-if test "${enable_bigendian+set}" = set; then
+-  enableval="$enable_bigendian"
+-  krb_cv_c_bigendian=yes
++
++
++# Check whether --with-sl or --without-sl was given.
++if test "${with_sl+set}" = set; then
++  withval="$with_sl"
++
+ fi;
+-# Check whether --enable-littleendian or --disable-littleendian was given.
+-if test "${enable_littleendian+set}" = set; then
+-  enableval="$enable_littleendian"
+-  krb_cv_c_bigendian=no
++
++# Check whether --with-sl-lib or --without-sl-lib was given.
++if test "${with_sl_lib+set}" = set; then
++  withval="$with_sl_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-sl-lib" >&5
++echo "$as_me: error: No argument for --with-sl-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_sl" = "X"; then
++  with_sl=yes
++fi
+ fi;
+-echo "$as_me:$LINENO: checking whether byte order is known at compile time" >&5
+-echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
+-if test "${krb_cv_c_bigendian_compile+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++
++# Check whether --with-sl-include or --without-sl-include was given.
++if test "${with_sl_include+set}" = set; then
++  withval="$with_sl_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-sl-include" >&5
++echo "$as_me: error: No argument for --with-sl-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_sl" = "X"; then
++  with_sl=yes
++fi
++fi;
++
++# Check whether --with-sl-config or --without-sl-config was given.
++if test "${with_sl_config+set}" = set; then
++  withval="$with_sl_config"
++
++fi;
++
++
++
++echo "$as_me:$LINENO: checking for sl" >&5
++echo $ECHO_N "checking for sl... $ECHO_C" >&6
++
++case "$with_sl" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_sl" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_sl_include" = ""; then
++		if test -d "$i/include/sl"; then
++			header_dirs="$header_dirs $i/include/sl"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_sl_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_sl_include"; then
++	header_dirs="$with_sl_include $header_dirs"
++fi
++if test "$with_sl_lib"; then
++	lib_dirs="$with_sl_lib $lib_dirs"
++fi
++
++if test "$with_sl_config" = ""; then
++	with_sl_config=''
++fi
++
++sl_cflags=
++sl_libs=
++
++case "$with_sl_config" in
++yes|no|"")
++	;;
++*)
++	sl_cflags="`$with_sl_config --cflags 2>&1`"
++	sl_libs="`$with_sl_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_sl" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$sl_cflags" -a "$sl_libs"; then
++		CFLAGS="$sl_cflags $save_CFLAGS"
++		LIBS="$sl_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-#include <sys/types.h>
+-#include <sys/param.h>
+ int
+ main ()
+ {
+ 
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+- bogus endian macros
+-#endif
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  krb_cv_c_bigendian_compile=yes
++
++			INCLUDE_sl="$sl_cflags"
++			LIB_sl="$sl_libs"
++			echo "$as_me:$LINENO: result: from $with_sl_config" >&5
++echo "${ECHO_T}from $with_sl_config" >&6
++			found=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-krb_cv_c_bigendian_compile=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $krb_cv_c_bigendian_compile" >&5
+-echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+-if test "${krb_cv_c_bigendian+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-  if test "$krb_cv_c_bigendian_compile" = "yes"; then
+-    cat >conftest.$ac_ext <<_ACEOF
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-#include <sys/types.h>
+-#include <sys/param.h>
+ int
+ main ()
+ {
+ 
+-#if BYTE_ORDER != BIG_ENDIAN
+-  not big endian
+-#endif
+   ;
+   return 0;
+ }
+@@ -44908,8 +45043,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -44921,52 +45055,823 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  krb_cv_c_bigendian=yes
++  ires=$i;break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-krb_cv_c_bigendian=no
+ fi
+ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  else
+-    if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: specify either --enable-bigendian or --enable-littleendian" >&5
+-echo "$as_me: error: specify either --enable-bigendian or --enable-littleendian" >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lsl  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-main () {
+-      /* Are we little or big endian?  From Harbison&Steele.  */
+-      union
+-      {
+-	long l;
+-	char c[sizeof (long)];
+-    } u;
+-    u.l = 1;
+-    exit (u.c[sizeof (long) - 1] == 1);
+-  }
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
+ _ACEOF
+-rm -f conftest$ac_exeext
++rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  krb_cv_c_bigendian=no
++  lres=$i;break
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_sl" != "no"; then
++			DIR_sl=
++			INCLUDE_sl="-I$ires"
++			LIB_sl="-L$lres -lsl "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define SL 1
++_ACEOF
++
++	with_sl=yes
++else
++	with_sl=no
++	DIR_sl=
++	INCLUDE_sl=
++	LIB_sl=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++if ! test "$with_sl" = yes; then
++	DIR_sl="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++fi
++
++
++# Check whether --with-ss or --without-ss was given.
++if test "${with_ss+set}" = set; then
++  withval="$with_ss"
++
++fi;
++
++# Check whether --with-ss-lib or --without-ss-lib was given.
++if test "${with_ss_lib+set}" = set; then
++  withval="$with_ss_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-ss-lib" >&5
++echo "$as_me: error: No argument for --with-ss-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
++fi
++fi;
++
++# Check whether --with-ss-include or --without-ss-include was given.
++if test "${with_ss_include+set}" = set; then
++  withval="$with_ss_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-ss-include" >&5
++echo "$as_me: error: No argument for --with-ss-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
++fi
++fi;
++
++# Check whether --with-ss-config or --without-ss-config was given.
++if test "${with_ss_config+set}" = set; then
++  withval="$with_ss_config"
++
++fi;
++
++
++
++echo "$as_me:$LINENO: checking for ss" >&5
++echo $ECHO_N "checking for ss... $ECHO_C" >&6
++
++case "$with_ss" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_ss" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_ss_include" = ""; then
++		if test -d "$i/include/ss"; then
++			header_dirs="$header_dirs $i/include/ss"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_ss_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_ss_include"; then
++	header_dirs="$with_ss_include $header_dirs"
++fi
++if test "$with_ss_lib"; then
++	lib_dirs="$with_ss_lib $lib_dirs"
++fi
++
++if test "$with_ss_config" = ""; then
++	with_ss_config=''
++fi
++
++ss_cflags=
++ss_libs=
++
++case "$with_ss_config" in
++yes|no|"")
++	;;
++*)
++	ss_cflags="`$with_ss_config --cflags 2>&1`"
++	ss_libs="`$with_ss_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_ss" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$ss_cflags" -a "$ss_libs"; then
++		CFLAGS="$ss_cflags $save_CFLAGS"
++		LIBS="$ss_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++			INCLUDE_ss="$ss_cflags"
++			LIB_ss="$ss_libs"
++			echo "$as_me:$LINENO: result: from $with_ss_config" >&5
++echo "${ECHO_T}from $with_ss_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lss  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_ss" != "no"; then
++			DIR_ss=
++			INCLUDE_ss="-I$ires"
++			LIB_ss="-L$lres -lss "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define SS 1
++_ACEOF
++
++	with_ss=yes
++else
++	with_ss=no
++	DIR_ss=
++	INCLUDE_ss=
++	LIB_ss=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++if ! test "$with_sl" = yes; then
++	DIR_sl="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	DIR_ss=""
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++fi
++if test "$enable_otp" = "yes"; then
++
++
++# Check whether --with-otp or --without-otp was given.
++if test "${with_otp+set}" = set; then
++  withval="$with_otp"
++
++fi;
++
++# Check whether --with-otp-lib or --without-otp-lib was given.
++if test "${with_otp_lib+set}" = set; then
++  withval="$with_otp_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-otp-lib" >&5
++echo "$as_me: error: No argument for --with-otp-lib" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_otp" = "X"; then
++  with_otp=yes
++fi
++fi;
++
++# Check whether --with-otp-include or --without-otp-include was given.
++if test "${with_otp_include+set}" = set; then
++  withval="$with_otp_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { { echo "$as_me:$LINENO: error: No argument for --with-otp-include" >&5
++echo "$as_me: error: No argument for --with-otp-include" >&2;}
++   { (exit 1); exit 1; }; }
++elif test "X$with_otp" = "X"; then
++  with_otp=yes
++fi
++fi;
++
++# Check whether --with-otp-config or --without-otp-config was given.
++if test "${with_otp_config+set}" = set; then
++  withval="$with_otp_config"
++
++fi;
++
++
++
++echo "$as_me:$LINENO: checking for otp" >&5
++echo $ECHO_N "checking for otp... $ECHO_C" >&6
++
++case "$with_otp" in
++yes|"") d='' ;;
++no)	d= ;;
++*)	d="$with_otp" ;;
++esac
++
++header_dirs=
++lib_dirs=
++for i in $d /usr; do
++	if test "$with_otp_include" = ""; then
++		if test -d "$i/include/otp"; then
++			header_dirs="$header_dirs $i/include/otp"
++		fi
++		if test -d "$i/include"; then
++			header_dirs="$header_dirs $i/include"
++		fi
++	fi
++	if test "$with_otp_lib" = ""; then
++		if test -d "$i/lib$abilibdirext"; then
++			lib_dirs="$lib_dirs $i/lib$abilibdirext"
++		fi
++	fi
++done
++
++if test "$with_otp_include"; then
++	header_dirs="$with_otp_include $header_dirs"
++fi
++if test "$with_otp_lib"; then
++	lib_dirs="$with_otp_lib $lib_dirs"
++fi
++
++if test "$with_otp_config" = ""; then
++	with_otp_config=''
++fi
++
++otp_cflags=
++otp_libs=
++
++case "$with_otp_config" in
++yes|no|"")
++	;;
++*)
++	otp_cflags="`$with_otp_config --cflags 2>&1`"
++	otp_libs="`$with_otp_config --libs 2>&1`"
++	;;
++esac
++
++found=no
++if test "$with_otp" != no; then
++	save_CFLAGS="$CFLAGS"
++	save_LIBS="$LIBS"
++	if test "$otp_cflags" -a "$otp_libs"; then
++		CFLAGS="$otp_cflags $save_CFLAGS"
++		LIBS="$otp_libs $save_LIBS"
++		cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++			INCLUDE_otp="$otp_cflags"
++			LIB_otp="$otp_libs"
++			echo "$as_me:$LINENO: result: from $with_otp_config" >&5
++echo "${ECHO_T}from $with_otp_config" >&6
++			found=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++	fi
++	if test "$found" = no; then
++		ires= lres=
++		for i in $header_dirs; do
++			CFLAGS="-I$i $save_CFLAGS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ires=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++		done
++		for i in $lib_dirs; do
++			LIBS="-L$i -lotp  $save_LIBS"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lres=$i;break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++		done
++		if test "$ires" -a "$lres" -a "$with_otp" != "no"; then
++			DIR_otp=
++			INCLUDE_otp="-I$ires"
++			LIB_otp="-L$lres -lotp "
++			found=yes
++			echo "$as_me:$LINENO: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++		fi
++	fi
++	CFLAGS="$save_CFLAGS"
++	LIBS="$save_LIBS"
++fi
++
++if test "$found" = yes; then
++
++cat >>confdefs.h <<_ACEOF
++#define OTP 1
++_ACEOF
++
++	with_otp=yes
++else
++	with_otp=no
++	DIR_otp=
++	INCLUDE_otp=
++	LIB_otp=
++	echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++
++
++
++  if ! test "$with_otp" = yes; then
++	DIR_otp="otp"
++ 	LIB_otp='$(top_builddir)/lib/otp/libotp.la'
++  fi
++fi
++
++
++# Check whether --enable-bigendian or --disable-bigendian was given.
++if test "${enable_bigendian+set}" = set; then
++  enableval="$enable_bigendian"
++  krb_cv_c_bigendian=yes
++fi;
++# Check whether --enable-littleendian or --disable-littleendian was given.
++if test "${enable_littleendian+set}" = set; then
++  enableval="$enable_littleendian"
++  krb_cv_c_bigendian=no
++fi;
++echo "$as_me:$LINENO: checking whether byte order is known at compile time" >&5
++echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
++if test "${krb_cv_c_bigendian_compile+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/param.h>
++int
++main ()
++{
++
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_c_bigendian_compile=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++krb_cv_c_bigendian_compile=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $krb_cv_c_bigendian_compile" >&5
++echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
++echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++if test "${krb_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++  if test "$krb_cv_c_bigendian_compile" = "yes"; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#include <sys/param.h>
++int
++main ()
++{
++
++#if BYTE_ORDER != BIG_ENDIAN
++  not big endian
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++krb_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  else
++    if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: specify either --enable-bigendian or --enable-littleendian" >&5
++echo "$as_me: error: specify either --enable-bigendian or --enable-littleendian" >&2;}
++   { (exit 1); exit 1; }; }
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++main () {
++      /* Are we little or big endian?  From Harbison&Steele.  */
++      union
++      {
++	long l;
++	char c[sizeof (long)];
++    } u;
++    u.l = 1;
++    exit (u.c[sizeof (long) - 1] == 1);
++  }
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  krb_cv_c_bigendian=no
++else
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+@@ -45023,8 +45928,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45111,8 +46015,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45212,8 +46115,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45383,8 +46285,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45484,8 +46385,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45640,9 +46540,13 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for X" >&5
++
++
++if test "x$ac_path_x_has_been_run" != xyes; then
++  echo "$as_me:$LINENO: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
++ac_path_x_has_been_run=yes
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -45735,7 +46639,7 @@
+ /usr/openwin/share/include'
+ 
+ if test "$ac_x_includes" = no; then
+-  # Guess where to find include files, by looking for Intrinsic.h.
++  # Guess where to find include files, by looking for a specified header file.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -45809,8 +46713,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45870,11 +46773,15 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
++  # It might be that x_includes is empty (headers are found in the
++  # standard search path. Then output the corresponding message
++  ac_out_x_includes=$x_includes
++  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
++  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
++echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+ fi
+ 
+-
++fi
+ if test "$no_x" = yes; then
+   # Not all programs may use this symbol, but it does not hurt to define it.
+ 
+@@ -45922,8 +46829,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -45974,8 +46880,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46051,8 +46956,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46107,8 +47011,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46176,8 +47079,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46285,8 +47187,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46350,8 +47251,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46419,8 +47319,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46524,8 +47423,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46589,8 +47487,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46687,8 +47584,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46752,8 +47648,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46850,8 +47745,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46915,8 +47809,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -46995,8 +47888,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47138,10 +48030,6 @@
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+-## check for XauWriteAuth first, so we detect the case where
+-## XauReadAuth is in -lX11, but XauWriteAuth is only in -lXau this
+-## could be done by checking for XauReadAuth in -lXau first, but this
+-## breaks in IRIX 6.5
+ 
+ 
+ 
+@@ -47187,8 +48075,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47288,8 +48175,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47407,8 +48293,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47508,8 +48393,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47626,8 +48510,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47727,8 +48610,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47802,8 +48684,6 @@
+ 
+ LIBS="$ac_xxx"
+ 
+-## set LIB_XauReadAuth to union of these tests, since this is what the
+-## Makefiles are using
+ case "$ac_cv_funclib_XauWriteAuth" in
+ yes)	;;
+ no)	;;
+@@ -47926,8 +48806,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -47990,8 +48869,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48135,8 +49013,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48195,8 +49072,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48269,8 +49145,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48332,8 +49207,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48398,8 +49272,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48666,8 +49539,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48842,8 +49714,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -48943,8 +49814,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49060,8 +49930,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49161,8 +50030,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49278,8 +50146,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49379,8 +50246,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49496,8 +50362,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49597,8 +50462,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49797,8 +50661,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -49866,8 +50729,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50051,8 +50913,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50297,8 +51158,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50484,8 +51344,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50564,8 +51423,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50665,8 +51523,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50870,8 +51727,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -50938,8 +51794,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51005,8 +51860,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51072,8 +51926,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51139,8 +51992,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51206,8 +52058,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51273,8 +52124,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51340,8 +52190,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51407,8 +52256,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51492,8 +52340,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51573,8 +52420,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51654,8 +52500,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51735,8 +52580,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51816,8 +52660,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51897,8 +52740,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -51978,8 +52820,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52059,8 +52900,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52140,8 +52980,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52221,8 +53060,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52302,8 +53140,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52383,8 +53220,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52462,8 +53298,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52563,8 +53398,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52668,8 +53502,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -52709,8 +53542,10 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la \$(LIB_el_init) \$(LIB_tgetent)"
+ else
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libeditline.la \$(LIB_tgetent)"
+ fi
+ 
+@@ -52833,8 +53668,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -53101,8 +53935,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -53377,6 +54210,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${KRB4_TRUE}" && test -z "${KRB4_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"KRB4\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -54109,6 +54949,9 @@
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s,@MAINT@,$MAINT,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+ s,@LDFLAGS@,$LDFLAGS,;t t
+@@ -54133,13 +54976,9 @@
+ s,@STRIP@,$STRIP,;t t
+ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+ s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s,@mkdir_p@,$mkdir_p,;t t
+ s,@AWK@,$AWK,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@am__leading_dot@,$am__leading_dot,;t t
+-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+-s,@MAINT@,$MAINT,;t t
+ s,@build@,$build,;t t
+ s,@build_cpu@,$build_cpu,;t t
+ s,@build_vendor@,$build_vendor,;t t
+@@ -54171,8 +55010,10 @@
+ s,@WFLAGS@,$WFLAGS,;t t
+ s,@WFLAGS_NOUNUSED@,$WFLAGS_NOUNUSED,;t t
+ s,@WFLAGS_NOIMPLICITINT@,$WFLAGS_NOIMPLICITINT,;t t
++s,@DIR_openldap@,$DIR_openldap,;t t
+ s,@INCLUDE_openldap@,$INCLUDE_openldap,;t t
+ s,@LIB_openldap@,$LIB_openldap,;t t
++s,@DIR_krb4@,$DIR_krb4,;t t
+ s,@INCLUDE_krb4@,$INCLUDE_krb4,;t t
+ s,@LIB_krb4@,$LIB_krb4,;t t
+ s,@EXTRA_LIB45@,$EXTRA_LIB45,;t t
+@@ -54212,6 +55053,10 @@
+ s,@HAVE_NDBM_FALSE@,$HAVE_NDBM_FALSE,;t t
+ s,@DBLIB@,$DBLIB,;t t
+ s,@LIB_NDBM@,$LIB_NDBM,;t t
++s,@LIB_crypt@,$LIB_crypt,;t t
++s,@LIB_roken@,$LIB_roken,;t t
++s,@DIR_roken@,$DIR_roken,;t t
++s,@CPPFLAGS_roken@,$CPPFLAGS_roken,;t t
+ s,@VOID_RETSIGTYPE@,$VOID_RETSIGTYPE,;t t
+ s,@have_err_h_TRUE@,$have_err_h_TRUE,;t t
+ s,@have_err_h_FALSE@,$have_err_h_FALSE,;t t
+@@ -54241,11 +55086,6 @@
+ s,@LIB_getnameinfo@,$LIB_getnameinfo,;t t
+ s,@LIB_freeaddrinfo@,$LIB_freeaddrinfo,;t t
+ s,@LIB_gai_strerror@,$LIB_gai_strerror,;t t
+-s,@LIB_crypt@,$LIB_crypt,;t t
+-s,@DIR_roken@,$DIR_roken,;t t
+-s,@LIB_roken@,$LIB_roken,;t t
+-s,@INCLUDES_roken@,$INCLUDES_roken,;t t
+-s,@LIB_otp@,$LIB_otp,;t t
+ s,@OTP_TRUE@,$OTP_TRUE,;t t
+ s,@OTP_FALSE@,$OTP_FALSE,;t t
+ s,@LIB_security@,$LIB_security,;t t
+@@ -54255,10 +55095,21 @@
+ s,@CATMAN_TRUE@,$CATMAN_TRUE,;t t
+ s,@CATMAN_FALSE@,$CATMAN_FALSE,;t t
+ s,@CATMANEXT@,$CATMANEXT,;t t
++s,@DIR_readline@,$DIR_readline,;t t
+ s,@INCLUDE_readline@,$INCLUDE_readline,;t t
+ s,@LIB_readline@,$LIB_readline,;t t
++s,@DIR_hesiod@,$DIR_hesiod,;t t
+ s,@INCLUDE_hesiod@,$INCLUDE_hesiod,;t t
+ s,@LIB_hesiod@,$LIB_hesiod,;t t
++s,@DIR_sl@,$DIR_sl,;t t
++s,@INCLUDE_sl@,$INCLUDE_sl,;t t
++s,@LIB_sl@,$LIB_sl,;t t
++s,@DIR_ss@,$DIR_ss,;t t
++s,@INCLUDE_ss@,$INCLUDE_ss,;t t
++s,@LIB_ss@,$LIB_ss,;t t
++s,@DIR_otp@,$DIR_otp,;t t
++s,@INCLUDE_otp@,$INCLUDE_otp,;t t
++s,@LIB_otp@,$LIB_otp,;t t
+ s,@AIX_TRUE@,$AIX_TRUE,;t t
+ s,@AIX_FALSE@,$AIX_FALSE,;t t
+ s,@AIX4_TRUE@,$AIX4_TRUE,;t t
+@@ -54464,11 +55315,6 @@
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+   esac
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+@@ -54507,6 +55353,12 @@
+ 	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
+diff -ruN heimdal-0.6.3-old/doc/Makefile.in heimdal-0.6.3/doc/Makefile.in
+--- heimdal-0.6.3-old/doc/Makefile.in	2004-09-13 22:29:11.000000000 +1000
++++ heimdal-0.6.3/doc/Makefile.in	2004-09-14 08:39:50.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,72 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(heimdal_TEXINFOS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common mdate-sh
+-subdir = doc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-INFO_DEPS = $(srcdir)/heimdal.info
+-am__TEXINFO_TEX_DIR = $(srcdir)
+-DVIS = heimdal.dvi
+-PDFS = heimdal.pdf
+-PSS = heimdal.ps
+-HTMLS = heimdal.html
+-TEXINFOS = heimdal.texi
+-TEXI2DVI = texi2dvi
+-TEXI2PDF = $(TEXI2DVI) --pdf --batch
+-MAKEINFOHTML = $(MAKEINFO) --html
+-AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+-DVIPS = dvips
+-am__installdirs = "$(DESTDIR)$(infodir)"
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -130,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -140,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -163,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -181,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -189,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -237,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -317,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -325,61 +277,70 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ AUTOMAKE_OPTIONS = no-texinfo.tex
++
+ info_TEXINFOS = heimdal.texi
+ heimdal_TEXINFOS = intro.texi install.texi setup.texi kerberos4.texi
++subdir = doc
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++am__TEXINFO_TEX_DIR = $(srcdir)
++INFO_DEPS = heimdal.info
++DVIS = heimdal.dvi
++PDFS = heimdal.pdf
++PSS = heimdal.ps
++TEXINFOS = heimdal.texi
++DIST_COMMON = $(heimdal_TEXINFOS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am mdate-sh
+ all: all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .dvi .html .info .pdf .ps .texi
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps doc/Makefile'; \
++.SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .dvi .info .pdf .ps .texi
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps doc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  doc/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -391,49 +352,26 @@
+ 	-rm -f libtool
+ 
+ .texi.info:
+-	restore=: && \
+-	backupdir="$(am__leading_dot)am$$$$" && \
+-	am__cwd=`pwd` && cd $(srcdir) && \
+-	rm -rf $$backupdir && mkdir $$backupdir && \
+-	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+-	  if test -f $$f; then \
+-	    mv $$f $$backupdir; \
+-	    restore=mv; \
+-	  fi; \
+-	done; \
+-	cd "$$am__cwd"; \
+-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ $<; \
+-	then \
+-	  rc=0; \
+-	  cd $(srcdir); \
+-	else \
+-	  rc=$$?; \
+-	  cd $(srcdir) && \
+-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+-	fi; \
+-	rm -rf $$backupdir; \
+-	exit $$rc
++	@rm -f $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]
++	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
++	 -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .texi.dvi:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+-	$(TEXI2DVI) $<
++	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .texi.pdf:
+ 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+-	$(TEXI2PDF) $<
+-
+-.texi.html:
+-	$(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+-	 -o $@ $<
+-	if test ! -d $@ && test -d $(@:.html=); then \
+-	  mv $(@:.html=) $@; else :; fi
+-$(srcdir)/heimdal.info: heimdal.texi $(heimdal_TEXINFOS)
++	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
++heimdal.info: heimdal.texi $(heimdal_TEXINFOS)
+ heimdal.dvi: heimdal.texi $(heimdal_TEXINFOS)
+ heimdal.pdf: heimdal.texi $(heimdal_TEXINFOS)
+-heimdal.html: heimdal.texi $(heimdal_TEXINFOS)
++TEXI2DVI = texi2dvi
++
++TEXI2PDF = $(TEXI2DVI) --pdf --batch
++DVIPS = dvips
+ .dvi.ps:
+ 	$(DVIPS) -o $@ $<
+ 
+@@ -444,8 +382,8 @@
+ 	  list='$(INFO_DEPS)'; \
+ 	  for file in $$list; do \
+ 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
+-	    install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
++	    echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \
++	    install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \
+ 	  done; \
+ 	else :; fi
+ 	@$(NORMAL_UNINSTALL)
+@@ -453,19 +391,15 @@
+ 	for file in $$list; do \
+ 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
+ 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
+-	  (if cd "$(DESTDIR)$(infodir)"; then \
++	  (if cd $(DESTDIR)$(infodir); then \
+ 	     echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
+ 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+ 	   else :; fi); \
+ 	done
+ 
+ dist-info: $(INFO_DEPS)
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(INFO_DEPS)'; \
+ 	for base in $$list; do \
+-	  case $$base in \
+-	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
+-	  esac; \
+ 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
+ 	  for file in $$d/$$base*; do \
+ 	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+@@ -475,10 +409,10 @@
+ 	done
+ 
+ mostlyclean-aminfo:
+-	-rm -rf heimdal.aux heimdal.cp heimdal.cps heimdal.fn heimdal.fns heimdal.ky \
++	-rm -f heimdal.aux heimdal.cp heimdal.cps heimdal.fn heimdal.fns heimdal.ky \
+ 	  heimdal.kys heimdal.log heimdal.pg heimdal.tmp heimdal.toc \
+ 	  heimdal.tp heimdal.tps heimdal.vr heimdal.vrs heimdal.dvi \
+-	  heimdal.pdf heimdal.ps heimdal.html
++	  heimdal.pdf heimdal.ps
+ 
+ maintainer-clean-aminfo:
+ 	@list='$(INFO_DEPS)'; for i in $$list; do \
+@@ -492,9 +426,13 @@
+ ctags: CTAGS
+ CTAGS:
+ 
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -506,7 +444,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -528,10 +466,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(INFO_DEPS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(infodir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(infodir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -568,10 +505,6 @@
+ 
+ dvi-am: $(DVIS)
+ 
+-html: html-am
+-
+-html-am: $(HTMLS)
+-
+ info: info-am
+ 
+ info-am: $(INFO_DEPS)
+@@ -588,21 +521,17 @@
+ 
+ install-info-am: $(INFO_DEPS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(infodir)" || $(mkdir_p) "$(DESTDIR)$(infodir)"
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	list='$(INFO_DEPS)'; \
++	$(mkinstalldirs) $(DESTDIR)$(infodir)
++	@list='$(INFO_DEPS)'; \
+ 	for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	  esac; \
+ 	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+ 	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
+ 	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
+                        $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+ 	    if test -f $$ifile; then \
+ 	      relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
+-	      echo " $(INSTALL_DATA) '$$ifile' '$(DESTDIR)$(infodir)/$$relfile'"; \
+-	      $(INSTALL_DATA) "$$ifile" "$(DESTDIR)$(infodir)/$$relfile"; \
++	      echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
++	      $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
+ 	    else : ; fi; \
+ 	  done; \
+ 	done
+@@ -612,8 +541,8 @@
+ 	  list='$(INFO_DEPS)'; \
+ 	  for file in $$list; do \
+ 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
+-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
++	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
++	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
+ 	  done; \
+ 	else : ; fi
+ install-man:
+@@ -642,14 +571,14 @@
+ 
+ .PHONY: all all-am all-local check check-am check-local clean \
+ 	clean-generic clean-libtool dist-info distclean \
+-	distclean-generic distclean-libtool distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
+-	mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool pdf \
+-	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
++	distclean-generic distclean-libtool distdir dvi dvi-am info \
++	info-am install install-am install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-aminfo \
++	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	uninstall uninstall-am uninstall-info-am
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/include/config.h.in heimdal-0.6.3/include/config.h.in
+--- heimdal-0.6.3-old/include/config.h.in	2004-09-13 22:27:35.000000000 +1000
++++ heimdal-0.6.3/include/config.h.in	2004-09-14 08:38:53.000000000 +1000
+@@ -1241,7 +1241,7 @@
+    *, int, int) */
+ #undef OPENLOG_PROTO_COMPATIBLE
+ 
+-/* Define if you want OTP support in applications. */
++/* Define if you have the otp package. */
+ #undef OTP
+ 
+ /* Name of package */
+@@ -1277,6 +1277,12 @@
+ /* path to sbin */
+ #undef SBINDIR
+ 
++/* Define if you have the sl package. */
++#undef SL
++
++/* Define if you have the ss package. */
++#undef SS
++
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
+diff -ruN heimdal-0.6.3-old/include/kadm5/Makefile.in heimdal-0.6.3/include/kadm5/Makefile.in
+--- heimdal-0.6.3-old/include/kadm5/Makefile.in	2004-09-13 22:29:12.000000000 +1000
++++ heimdal-0.6.3/include/kadm5/Makefile.in	2004-09-14 08:39:51.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,59 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = include/kadm5
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -117,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -127,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -150,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -168,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -176,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -224,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -304,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -312,59 +277,60 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ CLEANFILES = admin.h kadm5_err.h private.h
++subdir = include/kadm5
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps include/kadm5/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps include/kadm5/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  include/kadm5/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -381,9 +347,13 @@
+ ctags: CTAGS
+ CTAGS:
+ 
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -395,7 +365,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -417,6 +387,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile all-local
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -455,8 +426,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -495,8 +464,8 @@
+ 
+ .PHONY: all all-am all-local check check-am check-local clean \
+ 	clean-generic clean-libtool distclean distclean-generic \
+-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-libtool distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+diff -ruN heimdal-0.6.3-old/include/Makefile.in heimdal-0.6.3/include/Makefile.in
+--- heimdal-0.6.3-old/include/Makefile.in	2004-09-13 22:29:11.000000000 +1000
++++ heimdal-0.6.3/include/Makefile.in	2004-09-14 08:39:51.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,9 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-SOURCES = bits.c make_crypto.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -30,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -44,89 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
+-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(srcdir)/config.h.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-noinst_PROGRAMS = bits$(EXEEXT) make_crypto$(EXEEXT)
+-subdir = include
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =
+-PROGRAMS = $(noinst_PROGRAMS)
+-bits_SOURCES = bits.c
+-bits_OBJECTS = bits.$(OBJEXT)
+-bits_LDADD = $(LDADD)
+-make_crypto_SOURCES = make_crypto.c
+-make_crypto_OBJECTS = make_crypto.$(OBJEXT)
+-make_crypto_LDADD = $(LDADD)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = bits.c make_crypto.c
+-DIST_SOURCES = bits.c make_crypto.c
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-am__installdirs = "$(DESTDIR)$(includedir)"
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(noinst_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -151,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -161,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -184,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -202,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -210,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -258,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -338,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -346,29 +277,48 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -DHOST=\"$(CANONICAL_HOST)\"
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ SUBDIRS = kadm5
++
++noinst_PROGRAMS = bits make_crypto
+ CHECK_LOCAL = 
++
+ include_HEADERS = krb5-types.h
+ noinst_HEADERS = crypto-headers.h
++
+ CLEANFILES = \
+ 	asn1.h		\
+ 	asn1_err.h	\
+@@ -406,40 +356,60 @@
+ 	sl.h		\
+ 	xdbm.h
+ 
++subdir = include
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES =
++noinst_PROGRAMS = bits$(EXEEXT) make_crypto$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++bits_SOURCES = bits.c
++bits_OBJECTS = bits.$(OBJEXT)
++bits_LDADD = $(LDADD)
++bits_DEPENDENCIES =
++bits_LDFLAGS =
++make_crypto_SOURCES = make_crypto.c
++make_crypto_OBJECTS = make_crypto.$(OBJEXT)
++make_crypto_LDADD = $(LDADD)
++make_crypto_DEPENDENCIES =
++make_crypto_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = bits.c make_crypto.c
++HEADERS = $(include_HEADERS) $(noinst_HEADERS)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \
++	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am config.h.in
++DIST_SUBDIRS = $(SUBDIRS)
++SOURCES = bits.c make_crypto.c
++
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps include/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps include/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  include/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ config.h: stamp-h1
+ 	@if test ! -f $@; then \
+@@ -450,10 +420,10 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ 	@rm -f stamp-h1
+ 	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
+-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
++
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOHEADER)
+-	rm -f stamp-h1
+-	touch $@
++	touch $(srcdir)/config.h.in
+ 
+ distclean-hdr:
+ 	-rm -f config.h stamp-h1
+@@ -472,19 +442,19 @@
+ 	$(LINK) $(make_crypto_LDFLAGS) $(make_crypto_OBJECTS) $(make_crypto_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -495,22 +465,23 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -572,6 +543,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -580,7 +559,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -606,6 +584,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -628,9 +607,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -642,7 +625,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -659,13 +642,13 @@
+ 	done
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -679,9 +662,8 @@
+ all-am: Makefile $(PROGRAMS) $(HEADERS) config.h all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -714,15 +696,13 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
+-distclean-am: clean-am distclean-compile distclean-generic \
+-	distclean-hdr distclean-libtool distclean-tags
++distclean-am: clean-am distclean-compile distclean-generic distclean-hdr \
++	distclean-libtool distclean-tags
+ 
+ dvi: dvi-recursive
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -767,16 +747,19 @@
+ 	clean-noinstPROGRAMS clean-recursive ctags ctags-recursive \
+ 	distclean distclean-compile distclean-generic distclean-hdr \
+ 	distclean-libtool distclean-recursive distclean-tags distdir \
+-	dvi dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	dvi dvi-am dvi-recursive info info-am info-recursive install \
++	install-am install-data install-data-am install-data-recursive \
++	install-exec install-exec-am install-exec-recursive \
+ 	install-includeHEADERS install-info install-info-am \
+-	install-man install-strip installcheck installcheck-am \
+-	installdirs installdirs-am maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am \
+-	uninstall-includeHEADERS uninstall-info-am
++	install-info-recursive install-man install-recursive \
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
++	ps-recursive tags tags-recursive uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/kadmin/Makefile.in heimdal-0.6.3/kadmin/Makefile.in
+--- heimdal-0.6.3-old/kadmin/Makefile.in	2004-09-13 22:29:13.000000000 +1000
++++ heimdal-0.6.3/kadmin/Makefile.in	2004-09-14 08:39:52.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(add_random_users_SOURCES) $(kadmin_SOURCES) $(kadmind_SOURCES) $(EXTRA_kadmind_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,112 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-sbin_PROGRAMS = kadmin$(EXEEXT)
+-libexec_PROGRAMS = kadmind$(EXEEXT)
+-noinst_PROGRAMS = add_random_users$(EXEEXT)
+-subdir = kadmin
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+-am_add_random_users_OBJECTS = add-random-users.$(OBJEXT)
+-add_random_users_OBJECTS = $(am_add_random_users_OBJECTS)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/hdb/libhdb.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-add_random_users_DEPENDENCIES =  \
+-	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+-	$(top_builddir)/lib/kadm5/libkadm5srv.la $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_1)
+-am_kadmin_OBJECTS = ank.$(OBJEXT) cpw.$(OBJEXT) del.$(OBJEXT) \
+-	del_enctype.$(OBJEXT) dump.$(OBJEXT) ext.$(OBJEXT) \
+-	get.$(OBJEXT) init.$(OBJEXT) kadmin.$(OBJEXT) load.$(OBJEXT) \
+-	mod.$(OBJEXT) rename.$(OBJEXT) util.$(OBJEXT) \
+-	random_password.$(OBJEXT)
+-kadmin_OBJECTS = $(am_kadmin_OBJECTS)
+-kadmin_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+-	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+-am__kadmind_SOURCES_DIST = kadmind.c server.c kadmin_locl.h version4.c \
+-	kadm_conn.c
+-@KRB4_TRUE@am__objects_1 = version4.$(OBJEXT)
+-am_kadmind_OBJECTS = kadmind.$(OBJEXT) server.$(OBJEXT) \
+-	$(am__objects_1) kadm_conn.$(OBJEXT)
+-kadmind_OBJECTS = $(am_kadmind_OBJECTS)
+-@KRB4_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+-kadmind_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+-	$(top_builddir)/lib/kadm5/libkadm5srv.la $(am__DEPENDENCIES_2) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(add_random_users_SOURCES) $(kadmin_SOURCES) \
+-	$(kadmind_SOURCES) $(EXTRA_kadmind_SOURCES)
+-DIST_SOURCES = $(add_random_users_SOURCES) $(kadmin_SOURCES) \
+-	$(am__kadmind_SOURCES_DIST) $(EXTRA_kadmind_SOURCES)
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -173,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -183,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -206,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -224,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -232,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -280,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -360,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -368,26 +277,48 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
++
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I/usr/include/editline $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++sbin_PROGRAMS = kadmin
++
++libexec_PROGRAMS = kadmind
++
+ man_MANS = kadmin.8 kadmind.8
++
++noinst_PROGRAMS = add_random_users
++
+ kadmin_SOURCES = \
+ 	ank.c					\
+ 	cpw.c					\
+@@ -405,8 +336,10 @@
+ 	random_password.c			\
+ 	kadmin_locl.h
+ 
++
+ @KRB4_TRUE@KRB4LIB = $(LIB_krb4)
+ @KRB4_TRUE@version4_c = version4.c
++
+ kadmind_SOURCES = \
+ 	kadmind.c				\
+ 	server.c				\
+@@ -414,8 +347,11 @@
+ 	$(version4_c)				\
+ 	kadm_conn.c
+ 
++
+ EXTRA_kadmind_SOURCES = version4.c
++
+ add_random_users_SOURCES = add-random-users.c
++
+ LDADD_common = \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(LIB_openldap) \
+@@ -425,69 +361,115 @@
+ 	$(LIB_roken) \
+ 	$(DBLIB)
+ 
++
+ kadmind_LDADD = $(KRB4LIB) $(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(LDADD_common) \
+ 	$(LIB_pidfile) \
+ 	$(LIB_dlopen)
+ 
++
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
+-	$(LIB_readline) \
++	$(LIB_sl) \
++	-ledit \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
++
+ add_random_users_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(LDADD_common) \
+ 	$(LIB_dlopen)
+ 
++subdir = kadmin
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++libexec_PROGRAMS = kadmind$(EXEEXT)
++noinst_PROGRAMS = add_random_users$(EXEEXT)
++sbin_PROGRAMS = kadmin$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS)
++
++am_add_random_users_OBJECTS = add-random-users.$(OBJEXT)
++add_random_users_OBJECTS = $(am_add_random_users_OBJECTS)
++add_random_users_DEPENDENCIES = \
++	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
++	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++add_random_users_LDFLAGS =
++am_kadmin_OBJECTS = ank.$(OBJEXT) cpw.$(OBJEXT) del.$(OBJEXT) \
++	del_enctype.$(OBJEXT) dump.$(OBJEXT) ext.$(OBJEXT) \
++	get.$(OBJEXT) init.$(OBJEXT) kadmin.$(OBJEXT) load.$(OBJEXT) \
++	mod.$(OBJEXT) rename.$(OBJEXT) util.$(OBJEXT) \
++	random_password.$(OBJEXT)
++kadmin_OBJECTS = $(am_kadmin_OBJECTS)
++kadmin_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5clnt.la \
++	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kadmin_LDFLAGS =
++am__kadmind_SOURCES_DIST = kadmind.c server.c kadmin_locl.h version4.c \
++	kadm_conn.c
++@KRB4_TRUE@am__objects_1 = version4.$(OBJEXT)
++am_kadmind_OBJECTS = kadmind.$(OBJEXT) server.$(OBJEXT) $(am__objects_1) \
++	kadm_conn.$(OBJEXT)
++kadmind_OBJECTS = $(am_kadmind_OBJECTS)
++@KRB4_TRUE@kadmind_DEPENDENCIES = \
++@KRB4_TRUE@	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++@KRB4_TRUE@	$(top_builddir)/lib/hdb/libhdb.la \
++@KRB4_TRUE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB4_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@kadmind_DEPENDENCIES = \
++@KRB4_FALSE@	$(top_builddir)/lib/kadm5/libkadm5srv.la \
++@KRB4_FALSE@	$(top_builddir)/lib/hdb/libhdb.la \
++@KRB4_FALSE@	$(top_builddir)/lib/krb5/libkrb5.la \
++@KRB4_FALSE@	$(top_builddir)/lib/asn1/libasn1.la
++kadmind_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(add_random_users_SOURCES) $(kadmin_SOURCES) \
++	$(am__kadmind_SOURCES_DIST) $(EXTRA_kadmind_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(add_random_users_SOURCES) $(kadmin_SOURCES) $(kadmind_SOURCES) $(EXTRA_kadmind_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps kadmin/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps kadmin/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  kadmin/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -495,8 +477,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -512,17 +494,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
++	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -530,8 +513,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
++	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+ 	done
+ 
+ clean-sbinPROGRAMS:
+@@ -551,19 +534,19 @@
+ 	$(LINK) $(kadmind_LDFLAGS) $(kadmind_OBJECTS) $(kadmind_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -574,9 +557,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -595,8 +580,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -616,10 +601,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -628,7 +621,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -643,6 +635,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -665,9 +658,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -679,7 +676,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -701,10 +698,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -743,8 +739,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -780,8 +774,8 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS \
+-	uninstall-man uninstall-sbinPROGRAMS
++uninstall-am: uninstall-info-am uninstall-libexecPROGRAMS uninstall-man \
++	uninstall-sbinPROGRAMS
+ 
+ uninstall-man: uninstall-man8
+ 
+@@ -789,17 +783,16 @@
+ 	clean clean-generic clean-libexecPROGRAMS clean-libtool \
+ 	clean-noinstPROGRAMS clean-sbinPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-libexecPROGRAMS install-man install-man8 \
+-	install-sbinPROGRAMS install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-info-am \
+-	uninstall-libexecPROGRAMS uninstall-man uninstall-man8 \
+-	uninstall-sbinPROGRAMS
++	install-sbinPROGRAMS install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-info-am uninstall-libexecPROGRAMS \
++	uninstall-man uninstall-man8 uninstall-sbinPROGRAMS
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/kdc/Makefile.in heimdal-0.6.3/kdc/Makefile.in
+--- heimdal-0.6.3-old/kdc/Makefile.in	2004-09-13 22:29:15.000000000 +1000
++++ heimdal-0.6.3/kdc/Makefile.in	2004-09-14 08:39:52.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(hprop_SOURCES) $(hpropd_SOURCES) $(kdc_SOURCES) $(kstash_SOURCES) $(string2key_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,129 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = string2key$(EXEEXT)
+-sbin_PROGRAMS = kstash$(EXEEXT)
+-libexec_PROGRAMS = hprop$(EXEEXT) hpropd$(EXEEXT) kdc$(EXEEXT)
+-subdir = kdc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(sbin_PROGRAMS)
+-am_hprop_OBJECTS = hprop.$(OBJEXT) mit_dump.$(OBJEXT) \
+-	v4_dump.$(OBJEXT)
+-hprop_OBJECTS = $(am_hprop_OBJECTS)
+-am__DEPENDENCIES_1 =
+-hprop_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_hpropd_OBJECTS = hpropd.$(OBJEXT)
+-hpropd_OBJECTS = $(am_hpropd_OBJECTS)
+-hpropd_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am__kdc_SOURCES_DIST = config.c connect.c kdc_locl.h kerberos5.c log.c \
+-	main.c misc.c 524.c kerberos4.c kaserver.c rx.h
+-@KRB4_TRUE@am__objects_1 = kaserver.$(OBJEXT)
+-am_kdc_OBJECTS = config.$(OBJEXT) connect.$(OBJEXT) \
+-	kerberos5.$(OBJEXT) log.$(OBJEXT) main.$(OBJEXT) \
+-	misc.$(OBJEXT) 524.$(OBJEXT) kerberos4.$(OBJEXT) \
+-	$(am__objects_1)
+-kdc_OBJECTS = $(am_kdc_OBJECTS)
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/hdb/libhdb.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-kdc_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+-am_kstash_OBJECTS = kstash.$(OBJEXT)
+-kstash_OBJECTS = $(am_kstash_OBJECTS)
+-kstash_LDADD = $(LDADD)
+-kstash_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-am_string2key_OBJECTS = string2key.$(OBJEXT)
+-string2key_OBJECTS = $(am_string2key_OBJECTS)
+-string2key_LDADD = $(LDADD)
+-string2key_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(hprop_SOURCES) $(hpropd_SOURCES) $(kdc_SOURCES) \
+-	$(kstash_SOURCES) $(string2key_SOURCES)
+-DIST_SOURCES = $(hprop_SOURCES) $(hpropd_SOURCES) \
+-	$(am__kdc_SOURCES_DIST) $(kstash_SOURCES) \
+-	$(string2key_SOURCES)
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -190,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -200,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -223,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -241,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -249,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -297,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -377,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -385,32 +277,58 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = string2key
++
++sbin_PROGRAMS = kstash
++
++libexec_PROGRAMS = hprop hpropd kdc
++
+ man_MANS = kdc.8 kstash.8 hprop.8 hpropd.8 string2key.8
++
+ hprop_SOURCES = hprop.c mit_dump.c v4_dump.c hprop.h kadb.h 
+ hpropd_SOURCES = hpropd.c hprop.h
++
+ kstash_SOURCES = kstash.c headers.h
++
+ string2key_SOURCES = string2key.c headers.h
+-@KRB4_FALSE@krb4_sources = 
++
+ @KRB4_TRUE@krb4_sources = kaserver.c rx.h
++@KRB4_FALSE@krb4_sources = 
++
+ kdc_SOURCES = \
+ 	config.c	\
+ 	connect.c	\
+@@ -423,6 +341,7 @@
+ 	kerberos4.c	\
+ 	$(krb4_sources)
+ 
++
+ hprop_LDADD = \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(LIB_openldap) \
+@@ -433,6 +352,7 @@
+ 	$(LIB_roken) \
+ 	$(DBLIB) 
+ 
++
+ hpropd_LDADD = \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+ 	$(LIB_openldap) \
+@@ -443,6 +363,7 @@
+ 	$(LIB_roken) \
+ 	$(DBLIB) 
+ 
++
+ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
+ 	$(LIB_openldap) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+@@ -452,51 +373,95 @@
+ 	$(LIB_roken) \
+ 	$(DBLIB)
+ 
++
+ kdc_LDADD = $(LDADD) $(LIB_pidfile)
++subdir = kdc
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = string2key$(EXEEXT)
++libexec_PROGRAMS = hprop$(EXEEXT) hpropd$(EXEEXT) kdc$(EXEEXT)
++sbin_PROGRAMS = kstash$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(sbin_PROGRAMS)
++
++am_hprop_OBJECTS = hprop.$(OBJEXT) mit_dump.$(OBJEXT) v4_dump.$(OBJEXT)
++hprop_OBJECTS = $(am_hprop_OBJECTS)
++hprop_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++hprop_LDFLAGS =
++am_hpropd_OBJECTS = hpropd.$(OBJEXT)
++hpropd_OBJECTS = $(am_hpropd_OBJECTS)
++hpropd_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++hpropd_LDFLAGS =
++am__kdc_SOURCES_DIST = config.c connect.c kdc_locl.h kerberos5.c log.c \
++	main.c misc.c 524.c kerberos4.c kaserver.c rx.h
++@KRB4_TRUE@am__objects_1 = kaserver.$(OBJEXT)
++@KRB4_FALSE@am__objects_1 =
++am_kdc_OBJECTS = config.$(OBJEXT) connect.$(OBJEXT) kerberos5.$(OBJEXT) \
++	log.$(OBJEXT) main.$(OBJEXT) misc.$(OBJEXT) 524.$(OBJEXT) \
++	kerberos4.$(OBJEXT) $(am__objects_1)
++kdc_OBJECTS = $(am_kdc_OBJECTS)
++kdc_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kdc_LDFLAGS =
++am_kstash_OBJECTS = kstash.$(OBJEXT)
++kstash_OBJECTS = $(am_kstash_OBJECTS)
++kstash_LDADD = $(LDADD)
++kstash_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kstash_LDFLAGS =
++am_string2key_OBJECTS = string2key.$(OBJEXT)
++string2key_OBJECTS = $(am_string2key_OBJECTS)
++string2key_LDADD = $(LDADD)
++string2key_DEPENDENCIES = $(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++string2key_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(hprop_SOURCES) $(hpropd_SOURCES) \
++	$(am__kdc_SOURCES_DIST) $(kstash_SOURCES) $(string2key_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(hprop_SOURCES) $(hpropd_SOURCES) $(kdc_SOURCES) $(kstash_SOURCES) $(string2key_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps kdc/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps kdc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  kdc/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -504,8 +469,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -514,17 +479,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -532,8 +498,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -542,17 +508,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
++	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -560,8 +527,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
++	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+ 	done
+ 
+ clean-sbinPROGRAMS:
+@@ -587,19 +554,19 @@
+ 	$(LINK) $(string2key_LDFLAGS) $(string2key_OBJECTS) $(string2key_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -610,9 +577,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -631,8 +600,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -652,10 +621,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -664,7 +641,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -679,6 +655,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -701,9 +678,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -715,7 +696,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -737,10 +718,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -779,8 +759,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -826,17 +804,17 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ 	clean-libtool clean-sbinPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libexecPROGRAMS install-man \
+-	install-man8 install-sbinPROGRAMS install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am uninstall-libexecPROGRAMS uninstall-man \
+-	uninstall-man8 uninstall-sbinPROGRAMS
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-man8 \
++	install-sbinPROGRAMS install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
++	uninstall-libexecPROGRAMS uninstall-man uninstall-man8 \
++	uninstall-sbinPROGRAMS
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/kpasswd/Makefile.in heimdal-0.6.3/kpasswd/Makefile.in
+--- heimdal-0.6.3-old/kpasswd/Makefile.in	2004-09-13 22:29:16.000000000 +1000
++++ heimdal-0.6.3/kpasswd/Makefile.in	2004-09-14 08:39:53.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(kpasswd_SOURCES) kpasswd-generator.c $(kpasswdd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,103 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = kpasswd$(EXEEXT)
+-libexec_PROGRAMS = kpasswdd$(EXEEXT)
+-noinst_PROGRAMS = kpasswd-generator$(EXEEXT)
+-subdir = kpasswd
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
+-am_kpasswd_OBJECTS = kpasswd.$(OBJEXT)
+-kpasswd_OBJECTS = $(am_kpasswd_OBJECTS)
+-kpasswd_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-kpasswd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-kpasswd_generator_SOURCES = kpasswd-generator.c
+-kpasswd_generator_OBJECTS = kpasswd-generator.$(OBJEXT)
+-kpasswd_generator_LDADD = $(LDADD)
+-kpasswd_generator_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am_kpasswdd_OBJECTS = kpasswdd.$(OBJEXT)
+-kpasswdd_OBJECTS = $(am_kpasswdd_OBJECTS)
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-kpasswdd_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kpasswd_SOURCES) kpasswd-generator.c $(kpasswdd_SOURCES)
+-DIST_SOURCES = $(kpasswd_SOURCES) kpasswd-generator.c \
+-	$(kpasswdd_SOURCES)
+-man1dir = $(mandir)/man1
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -164,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -174,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -197,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -215,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -223,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -271,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -351,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -359,28 +277,52 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_des)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ man_MANS = kpasswd.1 kpasswdd.8
++
++bin_PROGRAMS = kpasswd
++
+ kpasswd_SOURCES = kpasswd.c kpasswd_locl.h
++
++libexec_PROGRAMS = kpasswdd
++
++noinst_PROGRAMS = kpasswd-generator
++
+ kpasswdd_SOURCES = kpasswdd.c kpasswd_locl.h
++
+ kpasswdd_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+@@ -390,55 +332,80 @@
+ 	$(LIB_dlopen) \
+ 	$(DBLIB)
+ 
++
+ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++subdir = kpasswd
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = kpasswd$(EXEEXT)
++libexec_PROGRAMS = kpasswdd$(EXEEXT)
++noinst_PROGRAMS = kpasswd-generator$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
++
++am_kpasswd_OBJECTS = kpasswd.$(OBJEXT)
++kpasswd_OBJECTS = $(am_kpasswd_OBJECTS)
++kpasswd_LDADD = $(LDADD)
++kpasswd_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kpasswd_LDFLAGS =
++kpasswd_generator_SOURCES = kpasswd-generator.c
++kpasswd_generator_OBJECTS = kpasswd-generator.$(OBJEXT)
++kpasswd_generator_LDADD = $(LDADD)
++kpasswd_generator_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kpasswd_generator_LDFLAGS =
++am_kpasswdd_OBJECTS = kpasswdd.$(OBJEXT)
++kpasswdd_OBJECTS = $(am_kpasswdd_OBJECTS)
++kpasswdd_DEPENDENCIES = $(top_builddir)/lib/kadm5/libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kpasswdd_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(kpasswd_SOURCES) kpasswd-generator.c \
++	$(kpasswdd_SOURCES)
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(kpasswd_SOURCES) kpasswd-generator.c $(kpasswdd_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps kpasswd/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps kpasswd/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  kpasswd/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -446,8 +413,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -456,17 +423,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -474,8 +442,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -502,19 +470,19 @@
+ 	$(LINK) $(kpasswdd_LDFLAGS) $(kpasswdd_OBJECTS) $(kpasswdd_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -525,9 +493,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -546,8 +516,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -567,12 +537,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -591,8 +563,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -612,10 +584,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -624,7 +604,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -639,6 +618,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -661,9 +641,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -675,7 +659,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -697,10 +681,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -739,8 +722,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -785,17 +766,17 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+ 	clean-libtool clean-noinstPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binPROGRAMS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libexecPROGRAMS install-man \
+-	install-man1 install-man8 install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-info-am uninstall-libexecPROGRAMS uninstall-man \
+-	uninstall-man1 uninstall-man8
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-libexecPROGRAMS install-man install-man1 install-man8 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-info-am \
++	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
++	uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/kuser/Makefile.in heimdal-0.6.3/kuser/Makefile.in
+--- heimdal-0.6.3-old/kuser/Makefile.in	2004-09-13 22:29:17.000000000 +1000
++++ heimdal-0.6.3/kuser/Makefile.in	2004-09-14 08:39:53.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = generate-requests.c kdecode_ticket.c kdestroy.c kgetcred.c kinit.c klist.c kverify.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,124 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = kinit$(EXEEXT) klist$(EXEEXT) kdestroy$(EXEEXT) \
+-	kgetcred$(EXEEXT)
+-noinst_PROGRAMS = kverify$(EXEEXT) kdecode_ticket$(EXEEXT) \
+-	generate-requests$(EXEEXT)
+-subdir = kuser
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+-generate_requests_SOURCES = generate-requests.c
+-generate_requests_OBJECTS = generate-requests.$(OBJEXT)
+-generate_requests_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-generate_requests_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-kdecode_ticket_SOURCES = kdecode_ticket.c
+-kdecode_ticket_OBJECTS = kdecode_ticket.$(OBJEXT)
+-kdecode_ticket_LDADD = $(LDADD)
+-kdecode_ticket_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-kdestroy_SOURCES = kdestroy.c
+-kdestroy_OBJECTS = kdestroy.$(OBJEXT)
+-am__DEPENDENCIES_2 = $(top_builddir)/lib/kafs/libkafs.la \
+-	$(am__DEPENDENCIES_1)
+-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \
+-	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-kdestroy_DEPENDENCIES = $(am__DEPENDENCIES_3)
+-kgetcred_SOURCES = kgetcred.c
+-kgetcred_OBJECTS = kgetcred.$(OBJEXT)
+-kgetcred_LDADD = $(LDADD)
+-kgetcred_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-kinit_SOURCES = kinit.c
+-kinit_OBJECTS = kinit.$(OBJEXT)
+-kinit_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+-	$(top_builddir)/lib/krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-klist_SOURCES = klist.c
+-klist_OBJECTS = klist.$(OBJEXT)
+-klist_DEPENDENCIES = $(am__DEPENDENCIES_3)
+-kverify_SOURCES = kverify.c
+-kverify_OBJECTS = kverify.$(OBJEXT)
+-kverify_LDADD = $(LDADD)
+-kverify_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = generate-requests.c kdecode_ticket.c kdestroy.c kgetcred.c \
+-	kinit.c klist.c kverify.c
+-DIST_SOURCES = generate-requests.c kdecode_ticket.c kdestroy.c \
+-	kgetcred.c kinit.c klist.c kverify.c
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -185,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -195,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -218,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -236,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -244,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -292,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -372,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -380,26 +277,46 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1
++
++bin_PROGRAMS = kinit klist kdestroy kgetcred
++
++noinst_PROGRAMS = kverify kdecode_ticket generate-requests
++
+ kinit_LDADD = \
+ 	$(LIB_kafs) \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+@@ -408,58 +325,109 @@
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++
+ kdestroy_LDADD = $(kinit_LDADD)
++
+ klist_LDADD = $(kinit_LDADD)
++
+ LDADD = \
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++subdir = kuser
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = kinit$(EXEEXT) klist$(EXEEXT) kdestroy$(EXEEXT) \
++	kgetcred$(EXEEXT)
++noinst_PROGRAMS = kverify$(EXEEXT) kdecode_ticket$(EXEEXT) \
++	generate-requests$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++
++generate_requests_SOURCES = generate-requests.c
++generate_requests_OBJECTS = generate-requests.$(OBJEXT)
++generate_requests_LDADD = $(LDADD)
++generate_requests_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++generate_requests_LDFLAGS =
++kdecode_ticket_SOURCES = kdecode_ticket.c
++kdecode_ticket_OBJECTS = kdecode_ticket.$(OBJEXT)
++kdecode_ticket_LDADD = $(LDADD)
++kdecode_ticket_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kdecode_ticket_LDFLAGS =
++kdestroy_SOURCES = kdestroy.c
++kdestroy_OBJECTS = kdestroy.$(OBJEXT)
++kdestroy_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kdestroy_LDFLAGS =
++kgetcred_SOURCES = kgetcred.c
++kgetcred_OBJECTS = kgetcred.$(OBJEXT)
++kgetcred_LDADD = $(LDADD)
++kgetcred_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kgetcred_LDFLAGS =
++kinit_SOURCES = kinit.c
++kinit_OBJECTS = kinit.$(OBJEXT)
++kinit_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kinit_LDFLAGS =
++klist_SOURCES = klist.c
++klist_OBJECTS = klist.$(OBJEXT)
++klist_DEPENDENCIES = $(top_builddir)/lib/kafs/libkafs.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++klist_LDFLAGS =
++kverify_SOURCES = kverify.c
++kverify_OBJECTS = kverify.$(OBJEXT)
++kverify_LDADD = $(LDADD)
++kverify_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++kverify_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = generate-requests.c kdecode_ticket.c kdestroy.c \
++	kgetcred.c kinit.c klist.c kverify.c
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = generate-requests.c kdecode_ticket.c kdestroy.c kgetcred.c kinit.c klist.c kverify.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps kuser/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps kuser/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  kuser/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -467,8 +435,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -507,19 +475,19 @@
+ 	$(LINK) $(kverify_LDFLAGS) $(kverify_OBJECTS) $(kverify_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -530,9 +498,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -551,8 +521,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -572,10 +542,18 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -584,7 +562,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -599,6 +576,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -621,9 +599,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -635,7 +617,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -657,10 +639,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -699,8 +680,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -744,15 +723,15 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libtool \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
+-	install-man1 install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+-	uninstall-man uninstall-man1
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-man1 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-info-am uninstall-man \
++	uninstall-man1
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/45/Makefile.in heimdal-0.6.3/lib/45/Makefile.in
+--- heimdal-0.6.3-old/lib/45/Makefile.in	2004-09-13 22:29:17.000000000 +1000
++++ heimdal-0.6.3/lib/45/Makefile.in	2004-09-14 08:39:54.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(lib45_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,78 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = lib/45
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-ARFLAGS = cru
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLIBRARIES_INSTALL = $(INSTALL_DATA)
+-LIBRARIES = $(lib_LIBRARIES)
+-lib45_a_AR = $(AR) $(ARFLAGS)
+-lib45_a_LIBADD =
+-am_lib45_a_OBJECTS = get_ad_tkt.$(OBJEXT) mk_req.$(OBJEXT)
+-lib45_a_OBJECTS = $(am_lib45_a_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(lib45_a_SOURCES)
+-DIST_SOURCES = $(lib45_a_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -139,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -149,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -172,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -190,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -198,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -246,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -326,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -334,77 +277,98 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ lib_LIBRARIES = @EXTRA_LIB45@
++
+ EXTRA_LIBRARIES = lib45.a
++
+ lib45_a_SOURCES = get_ad_tkt.c mk_req.c 45_locl.h
++subdir = lib/45
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(lib_LIBRARIES)
++
++lib45_a_AR = $(AR) cru
++lib45_a_LIBADD =
++am_lib45_a_OBJECTS = get_ad_tkt.$(OBJEXT) mk_req.$(OBJEXT)
++lib45_a_OBJECTS = $(am_lib45_a_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(lib45_a_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(lib45_a_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/45/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/45/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/45/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLIBRARIES_INSTALL = $(INSTALL_DATA)
+ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 	@$(POST_INSTALL)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
+-	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
++	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
++	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -412,8 +376,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLIBRARIES:
+@@ -424,19 +388,19 @@
+ 	$(RANLIB) lib45.a
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -448,6 +412,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -456,7 +428,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -471,6 +442,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -493,9 +465,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -507,7 +483,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -529,10 +505,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LIBRARIES) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -559,8 +534,7 @@
+ 	@echo "it deletes files that may require special tools to rebuild."
+ clean: clean-am
+ 
+-clean-am: clean-generic clean-libLIBRARIES clean-libtool \
+-	mostlyclean-am
++clean-am: clean-generic clean-libLIBRARIES clean-libtool mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -f Makefile
+@@ -571,8 +545,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -612,12 +584,12 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libLIBRARIES clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libLIBRARIES install-man install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am \
++	install-libLIBRARIES install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-info-am \
+diff -ruN heimdal-0.6.3-old/lib/asn1/Makefile.in heimdal-0.6.3/lib/asn1/Makefile.in
+--- heimdal-0.6.3-old/lib/asn1/Makefile.in	2004-09-13 22:29:19.000000000 +1000
++++ heimdal-0.6.3/lib/asn1/Makefile.in	2004-09-14 08:39:55.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libasn1_la_SOURCES) $(asn1_compile_SOURCES) asn1_print.c $(check_der_SOURCES) $(check_gen_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,128 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common lex.c parse.c parse.h
+-noinst_PROGRAMS = asn1_compile$(EXEEXT) asn1_print$(EXEEXT)
+-check_PROGRAMS = check-der$(EXEEXT) check-gen$(EXEEXT)
+-subdir = lib/asn1
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libasn1_la_DEPENDENCIES =
+-am__objects_1 = asn1_APOptions.lo asn1_AP_REP.lo asn1_AP_REQ.lo \
+-	asn1_AS_REP.lo asn1_AS_REQ.lo asn1_Authenticator.lo \
+-	asn1_AuthorizationData.lo asn1_CKSUMTYPE.lo \
+-	asn1_ChangePasswdDataMS.lo asn1_Checksum.lo asn1_ENCTYPE.lo \
+-	asn1_ETYPE_INFO.lo asn1_ETYPE_INFO_ENTRY.lo \
+-	asn1_EncAPRepPart.lo asn1_EncASRepPart.lo \
+-	asn1_EncKDCRepPart.lo asn1_EncKrbCredPart.lo \
+-	asn1_EncKrbPrivPart.lo asn1_EncTGSRepPart.lo \
+-	asn1_EncTicketPart.lo asn1_EncryptedData.lo \
+-	asn1_EncryptionKey.lo asn1_HostAddress.lo \
+-	asn1_HostAddresses.lo asn1_KDCOptions.lo asn1_KDC_REP.lo \
+-	asn1_KDC_REQ.lo asn1_KDC_REQ_BODY.lo asn1_KRB_CRED.lo \
+-	asn1_KRB_ERROR.lo asn1_KRB_PRIV.lo asn1_KRB_SAFE.lo \
+-	asn1_KRB_SAFE_BODY.lo asn1_KerberosTime.lo asn1_KrbCredInfo.lo \
+-	asn1_LastReq.lo asn1_LR_TYPE.lo asn1_MESSAGE_TYPE.lo \
+-	asn1_METHOD_DATA.lo asn1_NAME_TYPE.lo asn1_PADATA_TYPE.lo \
+-	asn1_PA_DATA.lo asn1_PA_ENC_TS_ENC.lo asn1_Principal.lo \
+-	asn1_PrincipalName.lo asn1_Realm.lo asn1_TGS_REP.lo \
+-	asn1_TGS_REQ.lo asn1_Ticket.lo asn1_TicketFlags.lo \
+-	asn1_TransitedEncoding.lo asn1_UNSIGNED.lo
+-am__objects_2 = $(am__objects_1) asn1_err.lo
+-am_libasn1_la_OBJECTS = der_get.lo der_put.lo der_free.lo \
+-	der_length.lo der_copy.lo timegm.lo $(am__objects_2)
+-libasn1_la_OBJECTS = $(am_libasn1_la_OBJECTS)
+-PROGRAMS = $(noinst_PROGRAMS)
+-am_asn1_compile_OBJECTS = gen.$(OBJEXT) gen_copy.$(OBJEXT) \
+-	gen_decode.$(OBJEXT) gen_encode.$(OBJEXT) gen_free.$(OBJEXT) \
+-	gen_glue.$(OBJEXT) gen_length.$(OBJEXT) hash.$(OBJEXT) \
+-	lex.$(OBJEXT) main.$(OBJEXT) parse.$(OBJEXT) symbol.$(OBJEXT)
+-asn1_compile_OBJECTS = $(am_asn1_compile_OBJECTS)
+-am__DEPENDENCIES_1 =
+-asn1_compile_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-asn1_print_SOURCES = asn1_print.c
+-asn1_print_OBJECTS = asn1_print.$(OBJEXT)
+-am__DEPENDENCIES_2 = libasn1.la $(am__DEPENDENCIES_1)
+-asn1_print_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-am_check_der_OBJECTS = check-der.$(OBJEXT) check-common.$(OBJEXT)
+-check_der_OBJECTS = $(am_check_der_OBJECTS)
+-check_der_DEPENDENCIES = libasn1.la $(am__DEPENDENCIES_1)
+-am_check_gen_OBJECTS = check-gen.$(OBJEXT) check-common.$(OBJEXT)
+-check_gen_OBJECTS = $(am_check_gen_OBJECTS)
+-check_gen_DEPENDENCIES = $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+-	$(AM_YFLAGS)
+-SOURCES = $(libasn1_la_SOURCES) $(asn1_compile_SOURCES) asn1_print.c \
+-	$(check_der_SOURCES) $(check_gen_SOURCES)
+-DIST_SOURCES = $(libasn1_la_SOURCES) $(asn1_compile_SOURCES) \
+-	asn1_print.c $(check_der_SOURCES) $(check_gen_SOURCES)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -191,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -201,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -224,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -242,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -250,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -298,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -378,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -386,34 +277,53 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ YFLAGS = -d
++
+ lib_LTLIBRARIES = libasn1.la
+ libasn1_la_LDFLAGS = -version-info 6:2:0
++
+ libasn1_la_LIBADD = @LIB_com_err@
++
+ BUILT_SOURCES = \
+ 	$(gen_files:.x=.c)	\
+ 	asn1_err.h		\
+ 	asn1_err.c
+ 
++
+ gen_files = \
+ 	asn1_APOptions.x			\
+ 	asn1_AP_REP.x				\
+@@ -468,9 +378,14 @@
+ 	asn1_TransitedEncoding.x		\
+ 	asn1_UNSIGNED.x
+ 
++
++noinst_PROGRAMS = asn1_compile asn1_print
++check_PROGRAMS = check-der check-gen
+ TESTS = check-der check-gen
++
+ check_der_SOURCES = check-der.c check-common.c
+ check_gen_SOURCES = check-gen.c check-common.c
++
+ asn1_compile_SOURCES = \
+ 	gen.c					\
+ 	gen_copy.c				\
+@@ -485,6 +400,7 @@
+ 	parse.y					\
+ 	symbol.c
+ 
++
+ libasn1_la_SOURCES = \
+ 	der_get.c				\
+ 	der_put.c				\
+@@ -494,62 +410,124 @@
+ 	timegm.c				\
+ 	$(BUILT_SOURCES)
+ 
++
+ asn1_compile_LDADD = \
+ 	$(LIB_roken) $(LEXLIB)
+ 
++
+ check_der_LDADD = \
+ 	libasn1.la \
+ 	$(LIB_roken)
+ 
++
+ check_gen_LDADD = $(check_der_LDADD)
+ asn1_print_LDADD = $(check_der_LDADD)
++
+ CLEANFILES = lex.c parse.c parse.h krb5_asn1.h $(BUILT_SOURCES) \
+ 	$(gen_files) asn1_files
+ 
++
+ include_HEADERS = krb5_asn1.h asn1_err.h der.h
++
+ EXTRA_DIST = asn1_err.et
++subdir = lib/asn1
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libasn1_la_DEPENDENCIES =
++am__objects_1 = asn1_APOptions.lo asn1_AP_REP.lo asn1_AP_REQ.lo \
++	asn1_AS_REP.lo asn1_AS_REQ.lo asn1_Authenticator.lo \
++	asn1_AuthorizationData.lo asn1_CKSUMTYPE.lo \
++	asn1_ChangePasswdDataMS.lo asn1_Checksum.lo asn1_ENCTYPE.lo \
++	asn1_ETYPE_INFO.lo asn1_ETYPE_INFO_ENTRY.lo \
++	asn1_EncAPRepPart.lo asn1_EncASRepPart.lo asn1_EncKDCRepPart.lo \
++	asn1_EncKrbCredPart.lo asn1_EncKrbPrivPart.lo \
++	asn1_EncTGSRepPart.lo asn1_EncTicketPart.lo \
++	asn1_EncryptedData.lo asn1_EncryptionKey.lo asn1_HostAddress.lo \
++	asn1_HostAddresses.lo asn1_KDCOptions.lo asn1_KDC_REP.lo \
++	asn1_KDC_REQ.lo asn1_KDC_REQ_BODY.lo asn1_KRB_CRED.lo \
++	asn1_KRB_ERROR.lo asn1_KRB_PRIV.lo asn1_KRB_SAFE.lo \
++	asn1_KRB_SAFE_BODY.lo asn1_KerberosTime.lo asn1_KrbCredInfo.lo \
++	asn1_LastReq.lo asn1_LR_TYPE.lo asn1_MESSAGE_TYPE.lo \
++	asn1_METHOD_DATA.lo asn1_NAME_TYPE.lo asn1_PADATA_TYPE.lo \
++	asn1_PA_DATA.lo asn1_PA_ENC_TS_ENC.lo asn1_Principal.lo \
++	asn1_PrincipalName.lo asn1_Realm.lo asn1_TGS_REP.lo \
++	asn1_TGS_REQ.lo asn1_Ticket.lo asn1_TicketFlags.lo \
++	asn1_TransitedEncoding.lo asn1_UNSIGNED.lo
++am__objects_2 = $(am__objects_1) asn1_err.lo
++am_libasn1_la_OBJECTS = der_get.lo der_put.lo der_free.lo der_length.lo \
++	der_copy.lo timegm.lo $(am__objects_2)
++libasn1_la_OBJECTS = $(am_libasn1_la_OBJECTS)
++check_PROGRAMS = check-der$(EXEEXT) check-gen$(EXEEXT)
++noinst_PROGRAMS = asn1_compile$(EXEEXT) asn1_print$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++am_asn1_compile_OBJECTS = gen.$(OBJEXT) gen_copy.$(OBJEXT) \
++	gen_decode.$(OBJEXT) gen_encode.$(OBJEXT) gen_free.$(OBJEXT) \
++	gen_glue.$(OBJEXT) gen_length.$(OBJEXT) hash.$(OBJEXT) \
++	lex.$(OBJEXT) main.$(OBJEXT) parse.$(OBJEXT) symbol.$(OBJEXT)
++asn1_compile_OBJECTS = $(am_asn1_compile_OBJECTS)
++asn1_compile_DEPENDENCIES =
++asn1_compile_LDFLAGS =
++asn1_print_SOURCES = asn1_print.c
++asn1_print_OBJECTS = asn1_print.$(OBJEXT)
++asn1_print_DEPENDENCIES = libasn1.la
++asn1_print_LDFLAGS =
++am_check_der_OBJECTS = check-der.$(OBJEXT) check-common.$(OBJEXT)
++check_der_OBJECTS = $(am_check_der_OBJECTS)
++check_der_DEPENDENCIES = libasn1.la
++check_der_LDFLAGS =
++am_check_gen_OBJECTS = check-gen.$(OBJEXT) check-common.$(OBJEXT)
++check_gen_OBJECTS = $(am_check_gen_OBJECTS)
++check_gen_DEPENDENCIES = libasn1.la
++check_gen_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
++LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
++YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
++LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
++DIST_SOURCES = $(libasn1_la_SOURCES) $(asn1_compile_SOURCES) \
++	asn1_print.c $(check_der_SOURCES) $(check_gen_SOURCES)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am lex.c parse.c \
++	parse.h
++SOURCES = $(libasn1_la_SOURCES) $(asn1_compile_SOURCES) asn1_print.c $(check_der_SOURCES) $(check_gen_SOURCES)
++
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .l .lo .o .obj .y
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/asn1/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/asn1/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/asn1/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -557,8 +535,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -604,27 +582,27 @@
+ 	$(LINK) $(check_gen_LDFLAGS) $(check_gen_OBJECTS) $(check_gen_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .l.c:
+-	$(LEXCOMPILE) $<
++	$(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
+ 	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
+ 	rm -f $(LEX_OUTPUT_ROOT).c
+ 
+ .y.c:
+-	$(YACCCOMPILE) $<
++	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+ 	if test -f y.tab.h; then \
+ 	  to=`echo "$*_H" | sed \
+                 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
+@@ -652,24 +630,33 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -678,7 +665,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -693,6 +679,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -729,24 +716,24 @@
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xpass=`expr $$xpass + 1`; \
+-		failed=`expr $$failed + 1`; \
+-		echo "XPASS: $$tst"; \
++	        xpass=`expr $$xpass + 1`; \
++	        failed=`expr $$failed + 1`; \
++	        echo "XPASS: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		echo "PASS: $$tst"; \
++	        echo "PASS: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xfail=`expr $$xfail + 1`; \
+-		echo "XFAIL: $$tst"; \
++	        xfail=`expr $$xfail + 1`; \
++	        echo "XFAIL: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		failed=`expr $$failed + 1`; \
+-		echo "FAIL: $$tst"; \
++	        failed=`expr $$failed + 1`; \
++	        echo "FAIL: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    else \
+@@ -788,9 +775,13 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	else :; fi
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -802,7 +793,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -826,10 +817,9 @@
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ install: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-am
+ install-exec: install-exec-am
+@@ -856,9 +846,9 @@
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+ 	@echo "it deletes files that may require special tools to rebuild."
+-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ 	-rm -f parse.h
+ 	-rm -f lex.c
++	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ 	-rm -f parse.c
+ clean: clean-am
+ 
+@@ -874,8 +864,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -917,17 +905,17 @@
+ .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
+ 	check-local clean clean-checkPROGRAMS clean-generic \
+ 	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am \
+-	install-includeHEADERS install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-includeHEADERS install-info \
++	install-info-am install-libLTLIBRARIES install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-info-am \
++	uninstall-libLTLIBRARIES
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/auth/afskauthlib/Makefile.in heimdal-0.6.3/lib/auth/afskauthlib/Makefile.in
+--- heimdal-0.6.3-old/lib/auth/afskauthlib/Makefile.in	2004-09-13 22:29:21.000000000 +1000
++++ heimdal-0.6.3/lib/auth/afskauthlib/Makefile.in	2004-09-14 08:39:55.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -27,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -41,62 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = lib/auth/afskauthlib
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-am__installdirs = "$(DESTDIR)$(foodir)"
+-fooDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(foo_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -121,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -128,10 +74,18 @@
+ DBLIB = @DBLIB@
+ DCE_FALSE = @DCE_FALSE@
+ DCE_TRUE = @DCE_TRUE@
++
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -154,12 +108,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -172,6 +131,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -180,6 +140,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -228,7 +189,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -308,7 +271,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -316,37 +278,49 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .o
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ foodir = $(libdir)
+ foo_DATA = afskauthlib.so
++
+ SRCS = verify.c
+ OBJS = verify.o
++
+ CLEANFILES = $(foo_DATA) $(OBJS) so_locations
+-@KRB4_TRUE@KAFS = $(top_builddir)/lib/kafs/libkafs.la
+-@KRB5_FALSE@L = \
+-@KRB5_FALSE@	$(KAFS)	\
+-@KRB5_FALSE@	$(LIB_krb4)				\
+-@KRB5_FALSE@	$(LIB_des)				\
+-@KRB5_FALSE@	$(top_builddir)/lib/roken/libroken.la	\
+-@KRB5_FALSE@	-lc
++
++@KRB4_TRUE@KAFS = $(LIB_kafs)
+ 
+ @KRB5_TRUE@L = \
+ @KRB5_TRUE@	$(KAFS)	\
+@@ -354,42 +328,38 @@
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la	\
+ @KRB5_TRUE@	$(LIB_krb4)				\
+ @KRB5_TRUE@	$(LIB_des)				\
+-@KRB5_TRUE@	$(top_builddir)/lib/roken/libroken.la	\
++@KRB5_TRUE@	$(LIB_roken)	\
+ @KRB5_TRUE@	-lc
+ 
++
++@KRB5_FALSE@L = \
++@KRB5_FALSE@	$(KAFS)	\
++@KRB5_FALSE@	$(LIB_krb4)				\
++@KRB5_FALSE@	$(LIB_des)				\
++@KRB5_FALSE@	$(LIB_roken)	\
++@KRB5_FALSE@	-lc
++
++subdir = lib/auth/afskauthlib
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++DATA = $(foo_DATA)
++
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .o
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/auth/afskauthlib/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/auth/afskauthlib/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/auth/afskauthlib/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -400,22 +370,23 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++fooDATA_INSTALL = $(INSTALL_DATA)
+ install-fooDATA: $(foo_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(foodir)" || $(mkdir_p) "$(DESTDIR)$(foodir)"
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(fooDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(foodir)/$$f'"; \
+-	  $(fooDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f"; \
++	  $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ 
+ uninstall-fooDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(foodir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(foodir)/$$f"; \
++	  rm -f $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -423,9 +394,13 @@
+ ctags: CTAGS
+ CTAGS:
+ 
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -437,7 +412,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -459,10 +434,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(DATA) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(foodir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -500,8 +474,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -540,8 +512,8 @@
+ 
+ .PHONY: all all-am all-local check check-am check-local clean \
+ 	clean-generic clean-libtool distclean distclean-generic \
+-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-libtool distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-fooDATA install-info install-info-am \
+ 	install-man install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+diff -ruN heimdal-0.6.3-old/lib/auth/Makefile.in heimdal-0.6.3/lib/auth/Makefile.in
+--- heimdal-0.6.3-old/lib/auth/Makefile.in	2004-09-13 22:29:20.000000000 +1000
++++ heimdal-0.6.3/lib/auth/Makefile.in	2004-09-14 08:39:55.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,67 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-subdir = lib/auth
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -125,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -135,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -158,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -176,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -184,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -232,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -312,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -320,60 +277,67 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ SUBDIRS = @LIB_AUTH_SUBDIRS@
+ DIST_SUBDIRS = afskauthlib pam sia
++subdir = lib/auth
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
+ all: all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/auth/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/auth/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/auth/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -444,6 +408,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -452,7 +424,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -478,6 +449,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -500,9 +472,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -514,7 +490,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -531,13 +507,13 @@
+ 	done
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -551,6 +527,7 @@
+ all-am: Makefile all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -588,8 +565,6 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -632,14 +607,18 @@
+ 	check-am check-local clean clean-generic clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++	info-recursive install install-am install-data install-data-am \
++	install-data-recursive install-exec install-exec-am \
++	install-exec-recursive install-info install-info-am \
++	install-info-recursive install-man install-recursive \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
++	tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/auth/pam/Makefile.in heimdal-0.6.3/lib/auth/pam/Makefile.in
+--- heimdal-0.6.3-old/lib/auth/pam/Makefile.in	2004-09-13 22:29:22.000000000 +1000
++++ heimdal-0.6.3/lib/auth/pam/Makefile.in	2004-09-14 08:39:56.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -27,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -41,62 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = lib/auth/pam
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-am__installdirs = "$(DESTDIR)$(foodir)"
+-fooDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(foo_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -121,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -128,10 +74,18 @@
+ DBLIB = @DBLIB@
+ DCE_FALSE = @DCE_FALSE@
+ DCE_TRUE = @DCE_TRUE@
++
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -154,12 +108,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -170,8 +129,10 @@
+ KRB4_TRUE = @KRB4_TRUE@
+ KRB5_FALSE = @KRB5_FALSE@
+ KRB5_TRUE = @KRB5_TRUE@
++
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -180,6 +141,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -228,7 +190,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -256,6 +220,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
++
+ WFLAGS = @WFLAGS@ $(WFLAGS_NOIMPLICITINT)
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+ WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
+@@ -308,7 +273,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -316,27 +280,43 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .o
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ @KRB4_TRUE@KAFS = $(top_builddir)/lib/kafs/.libs/libkafs.a
+ @KRB4_TRUE@KAFS_S = $(top_builddir)/lib/kafs/.libs/libkafs.so
++
+ @KRB4_TRUE@L = \
+ @KRB4_TRUE@	$(KAFS)						\
+ @KRB4_TRUE@	$(top_builddir)/lib/krb/.libs/libkrb.a		\
+@@ -344,6 +324,7 @@
+ @KRB4_TRUE@	$(top_builddir)/lib/roken/.libs/libroken.a	\
+ @KRB4_TRUE@	-lc
+ 
++
+ @KRB4_TRUE@L_shared = \
+ @KRB4_TRUE@	$(KAFS_S)					\
+ @KRB4_TRUE@	$(top_builddir)/lib/krb/.libs/libkrb.so		\
+@@ -352,45 +333,38 @@
+ @KRB4_TRUE@	$(LIB_getpwnam_r)				\
+ @KRB4_TRUE@	-lc
+ 
++
+ @KRB4_TRUE@MOD = pam_krb4.so
++
+ EXTRA_DIST = pam.conf.add
++
+ foodir = $(libdir)
+ foo_DATA = $(MOD)
++
+ OBJS = pam.o
++
+ CLEANFILES = $(MOD) $(OBJS)
++subdir = lib/auth/pam
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++DATA = $(foo_DATA)
++
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .o
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/auth/pam/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/auth/pam/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/auth/pam/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -401,22 +375,23 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++fooDATA_INSTALL = $(INSTALL_DATA)
+ install-fooDATA: $(foo_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(foodir)" || $(mkdir_p) "$(DESTDIR)$(foodir)"
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(fooDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(foodir)/$$f'"; \
+-	  $(fooDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f"; \
++	  $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ 
+ uninstall-fooDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(foodir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(foodir)/$$f"; \
++	  rm -f $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -424,9 +399,13 @@
+ ctags: CTAGS
+ CTAGS:
+ 
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -438,7 +417,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -460,10 +439,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(DATA) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(foodir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -501,8 +479,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -541,8 +517,8 @@
+ 
+ .PHONY: all all-am all-local check check-am check-local clean \
+ 	clean-generic clean-libtool distclean distclean-generic \
+-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-libtool distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-fooDATA install-info install-info-am \
+ 	install-man install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+diff -ruN heimdal-0.6.3-old/lib/auth/sia/Makefile.in heimdal-0.6.3/lib/auth/sia/Makefile.in
+--- heimdal-0.6.3-old/lib/auth/sia/Makefile.in	2004-09-13 22:29:22.000000000 +1000
++++ heimdal-0.6.3/lib/auth/sia/Makefile.in	2004-09-14 08:39:56.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -27,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -41,62 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = lib/auth/sia
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-am__installdirs = "$(DESTDIR)$(foodir)"
+-fooDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(foo_DATA)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -121,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -128,10 +74,18 @@
+ DBLIB = @DBLIB@
+ DCE_FALSE = @DCE_FALSE@
+ DCE_TRUE = @DCE_TRUE@
++
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -154,12 +108,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -170,8 +129,10 @@
+ KRB4_TRUE = @KRB4_TRUE@
+ KRB5_FALSE = @KRB5_FALSE@
+ KRB5_TRUE = @KRB5_TRUE@
++
+ LDFLAGS = @LDFLAGS@ -rpath $(libdir) -Wl,-hidden -Wl,-exported_symbol -Wl,siad_\* 
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -180,6 +141,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -228,7 +190,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -256,6 +220,7 @@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
++
+ WFLAGS = @WFLAGS@ $(WFLAGS_NOIMPLICITINT)
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+ WFLAGS_NOUNUSED = @WFLAGS_NOUNUSED@
+@@ -308,7 +273,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -316,36 +280,42 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .o
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ KAFS = $(top_builddir)/lib/kafs/.libs/libkafs.a
+ KAFS_S = $(top_builddir)/lib/kafs/.libs/libkafs.so
+-@KRB5_FALSE@L = \
+-@KRB5_FALSE@	$(KAFS)						\
+-@KRB5_FALSE@	$(top_builddir)/lib/kadm/.libs/libkadm.a	\
+-@KRB5_FALSE@	$(top_builddir)/lib/krb/.libs/libkrb.a		\
+-@KRB5_FALSE@	$(LIB_des_a)		\
+-@KRB5_FALSE@	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
+-@KRB5_FALSE@	$(top_builddir)/lib/roken/.libs/libroken.a	\
+-@KRB5_FALSE@	$(LIB_getpwnam_r)				\
+-@KRB5_FALSE@	-lc
+ 
+ @KRB5_TRUE@L = \
+ @KRB5_TRUE@	$(KAFS)						\
+@@ -358,16 +328,18 @@
+ @KRB5_TRUE@	$(LIB_getpwnam_r)				\
+ @KRB5_TRUE@	-lc
+ 
+-@KRB5_FALSE@L_shared = \
+-@KRB5_FALSE@	$(KAFS_S)					\
+-@KRB5_FALSE@	$(top_builddir)/lib/kadm/.libs/libkadm.so	\
+-@KRB5_FALSE@	$(top_builddir)/lib/krb/.libs/libkrb.so		\
+-@KRB5_FALSE@	$(LIB_des_so)		\
+-@KRB5_FALSE@	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
+-@KRB5_FALSE@	$(top_builddir)/lib/roken/.libs/libroken.so	\
++
++@KRB5_FALSE@L = \
++@KRB5_FALSE@	$(KAFS)						\
++@KRB5_FALSE@	$(top_builddir)/lib/kadm/.libs/libkadm.a	\
++@KRB5_FALSE@	$(top_builddir)/lib/krb/.libs/libkrb.a		\
++@KRB5_FALSE@	$(LIB_des_a)		\
++@KRB5_FALSE@	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
++@KRB5_FALSE@	$(top_builddir)/lib/roken/.libs/libroken.a	\
+ @KRB5_FALSE@	$(LIB_getpwnam_r)				\
+ @KRB5_FALSE@	-lc
+ 
++
+ @KRB5_TRUE@L_shared = \
+ @KRB5_TRUE@	$(KAFS_S)					\
+ @KRB5_TRUE@	$(top_builddir)/lib/krb5/.libs/libkrb5.so	\
+@@ -379,48 +351,53 @@
+ @KRB5_TRUE@	$(LIB_getpwnam_r)				\
+ @KRB5_TRUE@	-lc
+ 
+-@KRB5_FALSE@MOD = libsia_krb4.so
++
++@KRB5_FALSE@L_shared = \
++@KRB5_FALSE@	$(KAFS_S)					\
++@KRB5_FALSE@	$(top_builddir)/lib/kadm/.libs/libkadm.so	\
++@KRB5_FALSE@	$(top_builddir)/lib/krb/.libs/libkrb.so		\
++@KRB5_FALSE@	$(LIB_des_so)		\
++@KRB5_FALSE@	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
++@KRB5_FALSE@	$(top_builddir)/lib/roken/.libs/libroken.so	\
++@KRB5_FALSE@	$(LIB_getpwnam_r)				\
++@KRB5_FALSE@	-lc
++
++
+ @KRB5_TRUE@MOD = libsia_krb5.so
++
++@KRB5_FALSE@MOD = libsia_krb4.so
++
+ EXTRA_DIST = sia.c krb4_matrix.conf krb4+c2_matrix.conf \
+ 	krb5_matrix.conf krb5+c2_matrix.conf security.patch
+ 
++
+ foodir = $(libdir)
+ foo_DATA = $(MOD)
++
+ OBJS = sia.o posix_getpw.o
++
+ CLEANFILES = $(MOD) $(OBJS) so_locations
++subdir = lib/auth/sia
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++DATA = $(foo_DATA)
++
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .o
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/auth/sia/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/auth/sia/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/auth/sia/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -431,22 +408,23 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++fooDATA_INSTALL = $(INSTALL_DATA)
+ install-fooDATA: $(foo_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(foodir)" || $(mkdir_p) "$(DESTDIR)$(foodir)"
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(fooDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(foodir)/$$f'"; \
+-	  $(fooDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f"; \
++	  $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ 
+ uninstall-fooDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(foodir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(foodir)/$$f"; \
++	  rm -f $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -454,9 +432,13 @@
+ ctags: CTAGS
+ CTAGS:
+ 
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../../.. $(distdir)/../../../cf
++	$(mkinstalldirs) $(distdir)/../../.. $(distdir)/../../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -468,7 +450,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -490,10 +472,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(DATA) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(foodir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -531,8 +512,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -571,8 +550,8 @@
+ 
+ .PHONY: all all-am all-local check check-am check-local clean \
+ 	clean-generic clean-libtool distclean distclean-generic \
+-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-libtool distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-fooDATA install-info install-info-am \
+ 	install-man install-strip installcheck installcheck-am \
+ 	installdirs maintainer-clean maintainer-clean-generic \
+diff -ruN heimdal-0.6.3-old/lib/com_err/Makefile.in heimdal-0.6.3/lib/com_err/Makefile.in
+--- heimdal-0.6.3-old/lib/com_err/Makefile.in	2004-09-13 22:29:23.000000000 +1000
++++ heimdal-0.6.3/lib/com_err/Makefile.in	2004-09-14 08:39:57.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libcom_err_la_SOURCES) $(compile_et_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,92 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog lex.c parse.c \
+-	parse.h
+-bin_PROGRAMS = compile_et$(EXEEXT)
+-subdir = lib/com_err
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libcom_err_la_LIBADD =
+-am_libcom_err_la_OBJECTS = error.lo com_err.lo
+-libcom_err_la_OBJECTS = $(am_libcom_err_la_OBJECTS)
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_compile_et_OBJECTS = compile_et.$(OBJEXT) parse.$(OBJEXT) \
+-	lex.$(OBJEXT)
+-compile_et_OBJECTS = $(am_compile_et_OBJECTS)
+-am__DEPENDENCIES_1 =
+-compile_et_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+-	$(AM_YFLAGS)
+-SOURCES = $(libcom_err_la_SOURCES) $(compile_et_SOURCES)
+-DIST_SOURCES = $(libcom_err_la_SOURCES) $(compile_et_SOURCES)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -155,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -165,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -188,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -206,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -214,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -262,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -342,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -350,77 +277,119 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ YFLAGS = -d
++
+ lib_LTLIBRARIES = libcom_err.la
+ libcom_err_la_LDFLAGS = -version-info 2:1:1
++
++bin_PROGRAMS = compile_et
++
+ include_HEADERS = com_err.h com_right.h
++
+ compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l
++
+ libcom_err_la_SOURCES = error.c com_err.c roken_rename.h
++
+ CLEANFILES = lex.c parse.c parse.h
++
+ compile_et_LDADD = \
+ 	$(LIB_roken) \
+ 	$(LEXLIB)
+ 
++subdir = lib/com_err
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libcom_err_la_LIBADD =
++am_libcom_err_la_OBJECTS = error.lo com_err.lo
++libcom_err_la_OBJECTS = $(am_libcom_err_la_OBJECTS)
++bin_PROGRAMS = compile_et$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_compile_et_OBJECTS = compile_et.$(OBJEXT) parse.$(OBJEXT) \
++	lex.$(OBJEXT)
++compile_et_OBJECTS = $(am_compile_et_OBJECTS)
++compile_et_DEPENDENCIES =
++compile_et_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
++LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
++YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
++LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
++DIST_SOURCES = $(libcom_err_la_SOURCES) $(compile_et_SOURCES)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am lex.c \
++	parse.c parse.h
++SOURCES = $(libcom_err_la_SOURCES) $(compile_et_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .l .lo .o .obj .y
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/com_err/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/com_err/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/com_err/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -428,8 +397,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -442,17 +411,18 @@
+ 	done
+ libcom_err.la: $(libcom_err_la_OBJECTS) $(libcom_err_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libcom_err_la_LDFLAGS) $(libcom_err_la_OBJECTS) $(libcom_err_la_LIBADD) $(LIBS)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -460,8 +430,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -480,27 +450,27 @@
+ 	$(LINK) $(compile_et_LDFLAGS) $(compile_et_OBJECTS) $(compile_et_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .l.c:
+-	$(LEXCOMPILE) $<
++	$(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
+ 	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
+ 	rm -f $(LEX_OUTPUT_ROOT).c
+ 
+ .y.c:
+-	$(YACCCOMPILE) $<
++	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+ 	if test -f y.tab.h; then \
+ 	  to=`echo "$*_H" | sed \
+                 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
+@@ -528,24 +498,33 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -554,7 +533,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -569,6 +547,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -591,9 +570,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -605,7 +588,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -629,10 +612,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
+ install-binPROGRAMS: install-libLTLIBRARIES
+ 
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -675,8 +657,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -719,16 +699,16 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-includeHEADERS install-info install-info-am \
++	install-libLTLIBRARIES install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-includeHEADERS uninstall-info-am \
++	uninstall-libLTLIBRARIES
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/des/Makefile.in heimdal-0.6.3/lib/des/Makefile.in
+--- heimdal-0.6.3-old/lib/des/Makefile.in	2004-09-13 22:29:25.000000000 +1000
++++ heimdal-0.6.3/lib/des/Makefile.in	2004-09-14 08:39:57.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libdes_la_SOURCES) $(EXTRA_libdes_la_SOURCES) $(des_SOURCES) destest.c md5crypt_test.c mdtest.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,110 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog INSTALL
+-check_PROGRAMS = destest$(EXEEXT) mdtest$(EXEEXT) \
+-	md5crypt_test$(EXEEXT)
+-bin_PROGRAMS = des$(EXEEXT)
+-subdir = lib/des
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libdes_la_LIBADD =
+-am_libdes_la_OBJECTS = cbc3_enc.lo cbc_cksm.lo cbc_enc.lo cfb64ede.lo \
+-	cfb64enc.lo cfb_enc.lo des_enc.lo ecb3_enc.lo ecb_enc.lo \
+-	ede_enc.lo enc_read.lo enc_writ.lo fcrypt.lo key_par.lo md4.lo \
+-	md5.lo ncbc_enc.lo ofb64ede.lo ofb64enc.lo ofb_enc.lo \
+-	pcbc_enc.lo qud_cksm.lo rc4_skey.lo rc4_enc.lo read_pwd.lo \
+-	rnd_keys.lo set_key.lo sha.lo str2key.lo xcbc_enc.lo
+-libdes_la_OBJECTS = $(am_libdes_la_OBJECTS)
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_des_OBJECTS = des.$(OBJEXT)
+-des_OBJECTS = $(am_des_OBJECTS)
+-des_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 = libdes.la
+-des_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-destest_SOURCES = destest.c
+-destest_OBJECTS = destest.$(OBJEXT)
+-destest_LDADD = $(LDADD)
+-destest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-md5crypt_test_SOURCES = md5crypt_test.c
+-md5crypt_test_OBJECTS = md5crypt_test.$(OBJEXT)
+-md5crypt_test_LDADD = $(LDADD)
+-md5crypt_test_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-mdtest_SOURCES = mdtest.c
+-mdtest_OBJECTS = mdtest.$(OBJEXT)
+-mdtest_LDADD = $(LDADD)
+-mdtest_DEPENDENCIES = $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libdes_la_SOURCES) $(EXTRA_libdes_la_SOURCES) \
+-	$(des_SOURCES) destest.c md5crypt_test.c mdtest.c
+-DIST_SOURCES = $(libdes_la_SOURCES) $(EXTRA_libdes_la_SOURCES) \
+-	$(des_SOURCES) destest.c md5crypt_test.c mdtest.c
+-man1dir = $(mandir)/man1
+-man3dir = $(mandir)/man3
+-MANS = $(man_MANS)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -173,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -183,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -206,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -224,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -232,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -280,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -360,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -368,33 +277,57 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ lib_LTLIBRARIES = libdes.la
+ libdes_la_LDFLAGS = -version-info 3:1:0
++
+ include_HEADERS = des.h md4.h md5.h sha.h rc4.h
++
+ build_HEADERZ = $(include_HEADERS)
++
++check_PROGRAMS = destest mdtest md5crypt_test
++
+ TESTS = destest mdtest md5crypt_test
+ CHECK_LOCAL = 
++bin_PROGRAMS = des #rpw speed
++
+ des_SOURCES = des.c des_ver.h
++
+ LDADD = $(lib_LTLIBRARIES)
++
+ libdes_la_SOURCES = \
+ 	cbc3_enc.c	\
+ 	cbc_cksm.c	\
+@@ -432,10 +365,13 @@
+ 	str2key.c	\
+ 	xcbc_enc.c
+ 
++
+ EXTRA_libdes_la_SOURCES = dllmain.c passwd_dialog.aps passwd_dialog.clw \
+ 	passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h
+ 
++
+ man_MANS = des.1 des_crypt.3
++
+ EXTRA_DIST = \
+ 	COPYRIGHT	\
+ 	DES.pm		\
+@@ -476,51 +412,90 @@
+ 	version.h	\
+ 	vms.com
+ 
++
+ asm_files = des-som2.pl des-som3.pl des586.pl des686.pl desboth.pl \
+ 	dx86-cpp.s dx86unix.cpp readme win32.asm win32.obj win32.uu x86ms.pl \
+ 	x86unix.pl
+ 
++subdir = lib/des
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libdes_la_LIBADD =
++am_libdes_la_OBJECTS = cbc3_enc.lo cbc_cksm.lo cbc_enc.lo cfb64ede.lo \
++	cfb64enc.lo cfb_enc.lo des_enc.lo ecb3_enc.lo ecb_enc.lo \
++	ede_enc.lo enc_read.lo enc_writ.lo fcrypt.lo key_par.lo md4.lo \
++	md5.lo ncbc_enc.lo ofb64ede.lo ofb64enc.lo ofb_enc.lo \
++	pcbc_enc.lo qud_cksm.lo rc4_skey.lo rc4_enc.lo read_pwd.lo \
++	rnd_keys.lo set_key.lo sha.lo str2key.lo xcbc_enc.lo
++libdes_la_OBJECTS = $(am_libdes_la_OBJECTS)
++bin_PROGRAMS = des$(EXEEXT)
++check_PROGRAMS = destest$(EXEEXT) mdtest$(EXEEXT) md5crypt_test$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_des_OBJECTS = des.$(OBJEXT)
++des_OBJECTS = $(am_des_OBJECTS)
++des_LDADD = $(LDADD)
++des_DEPENDENCIES = libdes.la
++des_LDFLAGS =
++destest_SOURCES = destest.c
++destest_OBJECTS = destest.$(OBJEXT)
++destest_LDADD = $(LDADD)
++destest_DEPENDENCIES = libdes.la
++destest_LDFLAGS =
++md5crypt_test_SOURCES = md5crypt_test.c
++md5crypt_test_OBJECTS = md5crypt_test.$(OBJEXT)
++md5crypt_test_LDADD = $(LDADD)
++md5crypt_test_DEPENDENCIES = libdes.la
++md5crypt_test_LDFLAGS =
++mdtest_SOURCES = mdtest.c
++mdtest_OBJECTS = mdtest.$(OBJEXT)
++mdtest_LDADD = $(LDADD)
++mdtest_DEPENDENCIES = libdes.la
++mdtest_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libdes_la_SOURCES) $(EXTRA_libdes_la_SOURCES) \
++	$(des_SOURCES) destest.c md5crypt_test.c mdtest.c
++MANS = $(man_MANS)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog INSTALL \
++	Makefile.am
++SOURCES = $(libdes_la_SOURCES) $(EXTRA_libdes_la_SOURCES) $(des_SOURCES) destest.c md5crypt_test.c mdtest.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/des/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/des/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/des/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -528,8 +503,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -542,17 +517,18 @@
+ 	done
+ libdes.la: $(libdes_la_OBJECTS) $(libdes_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libdes_la_LDFLAGS) $(libdes_la_OBJECTS) $(libdes_la_LIBADD) $(LIBS)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -560,8 +536,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -591,19 +567,19 @@
+ 	$(LINK) $(mdtest_LDFLAGS) $(mdtest_OBJECTS) $(mdtest_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -614,9 +590,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -635,8 +613,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -656,12 +634,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
++
++man3dir = $(mandir)/man3
+ install-man3: $(man3_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+ 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -680,8 +660,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
+ uninstall-man3:
+ 	@$(NORMAL_UNINSTALL)
+@@ -701,27 +681,36 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -730,7 +719,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -745,6 +733,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -781,24 +770,24 @@
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xpass=`expr $$xpass + 1`; \
+-		failed=`expr $$failed + 1`; \
+-		echo "XPASS: $$tst"; \
++	        xpass=`expr $$xpass + 1`; \
++	        failed=`expr $$failed + 1`; \
++	        echo "XPASS: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		echo "PASS: $$tst"; \
++	        echo "PASS: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xfail=`expr $$xfail + 1`; \
+-		echo "XFAIL: $$tst"; \
++	        xfail=`expr $$xfail + 1`; \
++	        echo "XFAIL: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		failed=`expr $$failed + 1`; \
+-		echo "FAIL: $$tst"; \
++	        failed=`expr $$failed + 1`; \
++	        echo "FAIL: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    else \
+@@ -840,9 +829,13 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	else :; fi
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -854,7 +847,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -876,14 +869,12 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \
+-		all-local
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) all-local
+ install-binPROGRAMS: install-libLTLIBRARIES
+ 
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man3dir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -922,8 +913,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -967,19 +956,19 @@
+ .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
+ 	check-local clean clean-binPROGRAMS clean-checkPROGRAMS \
+ 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-binPROGRAMS \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-includeHEADERS install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-man1 install-man3 \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
+-	uninstall-man1 uninstall-man3
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-binPROGRAMS install-data install-data-am \
++	install-exec install-exec-am install-includeHEADERS \
++	install-info install-info-am install-libLTLIBRARIES install-man \
++	install-man1 install-man3 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-includeHEADERS uninstall-info-am \
++	uninstall-libLTLIBRARIES uninstall-man uninstall-man1 \
++	uninstall-man3
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/editline/Makefile.in heimdal-0.6.3/lib/editline/Makefile.in
+--- heimdal-0.6.3-old/lib/editline/Makefile.in	2004-09-13 22:29:26.000000000 +1000
++++ heimdal-0.6.3/lib/editline/Makefile.in	2004-09-14 08:39:58.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libeditline_la_SOURCES) $(libel_compat_la_SOURCES) testit.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,97 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-noinst_PROGRAMS = testit$(EXEEXT)
+-subdir = lib/editline
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+-libeditline_la_LIBADD =
+-am__libeditline_la_SOURCES_DIST = complete.c editline.c sysunix.c \
+-	editline.h roken_rename.h unix.h snprintf.c strdup.c
+-@do_roken_rename_TRUE@am__objects_1 = snprintf.lo strdup.lo
+-am__objects_2 = $(am__objects_1)
+-am_libeditline_la_OBJECTS = complete.lo editline.lo sysunix.lo \
+-	$(am__objects_2)
+-libeditline_la_OBJECTS = $(am_libeditline_la_OBJECTS)
+-libel_compat_la_LIBADD =
+-am_libel_compat_la_OBJECTS = edit_compat.lo
+-libel_compat_la_OBJECTS = $(am_libel_compat_la_OBJECTS)
+-PROGRAMS = $(noinst_PROGRAMS)
+-testit_SOURCES = testit.c
+-testit_OBJECTS = testit.$(OBJEXT)
+-am__DEPENDENCIES_1 =
+-testit_DEPENDENCIES = libeditline.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libeditline_la_SOURCES) $(libel_compat_la_SOURCES) \
+-	testit.c
+-DIST_SOURCES = $(am__libeditline_la_SOURCES_DIST) \
+-	$(libel_compat_la_SOURCES) testit.c
+-man3dir = $(mandir)/man3
+-MANS = $(man_MANS)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -160,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -170,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -193,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -211,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -219,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -267,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -347,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -355,37 +277,60 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(ROKEN_RENAME)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ @do_roken_rename_TRUE@ES = snprintf.c strdup.c
++
+ man_MANS = editline.3
++
+ lib_LTLIBRARIES = libeditline.la
+-@el_compat_FALSE@noinst_LTLIBRARIES = 
+ @el_compat_TRUE@noinst_LTLIBRARIES = libel_compat.la
++@el_compat_FALSE@noinst_LTLIBRARIES = 
++
++noinst_PROGRAMS = testit
++
+ CHECK_LOCAL = 
++
+ testit_LDADD = \
+ 	libeditline.la \
+ 	$(LIB_tgetent) \
+ 	$(LIB_roken)
+ 
++
+ include_HEADERS = editline.h
++
+ libeditline_la_SOURCES = \
+ 	complete.c \
+ 	editline.c \
+@@ -395,52 +340,80 @@
+ 	unix.h \
+ 	$(EXTRA_SOURCE)
+ 
+-libeditline_la_LDFLAGS = -static
++
++libeditline_la_LDFLAGS = -no-undefined
++
+ EXTRA_SOURCE = $(ES) 
++
+ libel_compat_la_SOURCES = edit_compat.c
+-libel_compat_la_LDFLAGS = -static
++
++libel_compat_la_LDFLAGS = -no-undefined
++
+ EXTRA_DIST = $(man_MANS)
++subdir = lib/editline
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
++
++libeditline_la_LIBADD =
++am__libeditline_la_SOURCES_DIST = complete.c editline.c sysunix.c \
++	editline.h roken_rename.h unix.h snprintf.c strdup.c
++@do_roken_rename_TRUE@am__objects_1 = snprintf.lo strdup.lo
++am__objects_2 = $(am__objects_1)
++am_libeditline_la_OBJECTS = complete.lo editline.lo sysunix.lo \
++	$(am__objects_2)
++libeditline_la_OBJECTS = $(am_libeditline_la_OBJECTS)
++libel_compat_la_LIBADD =
++am_libel_compat_la_OBJECTS = edit_compat.lo
++libel_compat_la_OBJECTS = $(am_libel_compat_la_OBJECTS)
++noinst_PROGRAMS = testit$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++testit_SOURCES = testit.c
++testit_OBJECTS = testit.$(OBJEXT)
++testit_DEPENDENCIES = libeditline.la
++testit_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__libeditline_la_SOURCES_DIST) \
++	$(libel_compat_la_SOURCES) testit.c
++MANS = $(man_MANS)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = README $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libeditline_la_SOURCES) $(libel_compat_la_SOURCES) testit.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/editline/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/editline/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/editline/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -448,8 +421,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -485,19 +458,19 @@
+ 	$(LINK) $(testit_LDFLAGS) $(testit_OBJECTS) $(testit_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -508,9 +481,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man3dir = $(mandir)/man3
+ install-man3: $(man3_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+ 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -529,8 +504,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
+ uninstall-man3:
+ 	@$(NORMAL_UNINSTALL)
+@@ -550,27 +525,36 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -579,7 +563,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -594,6 +577,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -616,9 +600,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -630,7 +618,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -651,12 +639,10 @@
+ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \
+-		all-local
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -695,8 +681,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -741,15 +725,15 @@
+ 	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-man3 install-strip installcheck installcheck-am \
+-	installdirs maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+-	uninstall-am uninstall-includeHEADERS uninstall-info-am \
++	install-info-am install-libLTLIBRARIES install-man install-man3 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-info-am \
+ 	uninstall-libLTLIBRARIES uninstall-man uninstall-man3
+ 
+ 
+diff -ruN heimdal-0.6.3-old/lib/gssapi/Makefile.in heimdal-0.6.3/lib/gssapi/Makefile.in
+--- heimdal-0.6.3-old/lib/gssapi/Makefile.in	2004-09-13 22:29:27.000000000 +1000
++++ heimdal-0.6.3/lib/gssapi/Makefile.in	2004-09-14 08:39:58.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,9 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-SOURCES = $(libgssapi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -30,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -44,95 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-subdir = lib/gssapi
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libgssapi_la_DEPENDENCIES = ../krb5/libkrb5.la $(am__DEPENDENCIES_1) \
+-	../asn1/libasn1.la ../roken/libroken.la
+-am_libgssapi_la_OBJECTS = 8003.lo arcfour.lo accept_sec_context.lo \
+-	acquire_cred.lo add_cred.lo add_oid_set_member.lo \
+-	canonicalize_name.lo compare_name.lo compat.lo context_time.lo \
+-	copy_ccache.lo create_emtpy_oid_set.lo decapsulate.lo \
+-	delete_sec_context.lo display_name.lo display_status.lo \
+-	duplicate_name.lo encapsulate.lo export_sec_context.lo \
+-	export_name.lo external.lo get_mic.lo import_name.lo \
+-	import_sec_context.lo indicate_mechs.lo init.lo \
+-	init_sec_context.lo inquire_context.lo inquire_cred.lo \
+-	inquire_cred_by_mech.lo inquire_mechs_for_name.lo \
+-	inquire_names_for_mech.lo release_buffer.lo release_cred.lo \
+-	release_name.lo release_oid_set.lo process_context_token.lo \
+-	test_oid_set_member.lo unwrap.lo v1.lo verify_mic.lo wrap.lo \
+-	address_to_krb5addr.lo
+-libgssapi_la_OBJECTS = $(am_libgssapi_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libgssapi_la_SOURCES)
+-DIST_SOURCES = $(libgssapi_la_SOURCES)
+-man3dir = $(mandir)/man3
+-MANS = $(man_MANS)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -157,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -167,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -190,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -208,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -216,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -264,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -344,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -352,30 +277,48 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I$(srcdir)/../krb5 $(INCLUDE_des) $(INCLUDE_krb4)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ lib_LTLIBRARIES = libgssapi.la
+ libgssapi_la_LDFLAGS = -version-info 5:0:4
+-libgssapi_la_LIBADD = ../krb5/libkrb5.la $(LIB_des) ../asn1/libasn1.la ../roken/libroken.la
++libgssapi_la_LIBADD = ../krb5/libkrb5.la $(LIB_des) ../asn1/libasn1.la $(LIB_roken)
++
+ man_MANS = gssapi.3 gss_acquire_cred.3
++
+ include_HEADERS = gssapi.h
++
+ libgssapi_la_SOURCES = \
+ 	8003.c			\
+ 	arcfour.c		\
+@@ -423,47 +366,67 @@
+         wrap.c                  \
+         address_to_krb5addr.c
+ 
++subdir = lib/gssapi
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libgssapi_la_DEPENDENCIES = ../krb5/libkrb5.la ../asn1/libasn1.la
++am_libgssapi_la_OBJECTS = 8003.lo arcfour.lo accept_sec_context.lo \
++	acquire_cred.lo add_cred.lo add_oid_set_member.lo \
++	canonicalize_name.lo compare_name.lo compat.lo context_time.lo \
++	copy_ccache.lo create_emtpy_oid_set.lo decapsulate.lo \
++	delete_sec_context.lo display_name.lo display_status.lo \
++	duplicate_name.lo encapsulate.lo export_sec_context.lo \
++	export_name.lo external.lo get_mic.lo import_name.lo \
++	import_sec_context.lo indicate_mechs.lo init.lo \
++	init_sec_context.lo inquire_context.lo inquire_cred.lo \
++	inquire_cred_by_mech.lo inquire_mechs_for_name.lo \
++	inquire_names_for_mech.lo release_buffer.lo release_cred.lo \
++	release_name.lo release_oid_set.lo process_context_token.lo \
++	test_oid_set_member.lo unwrap.lo v1.lo verify_mic.lo wrap.lo \
++	address_to_krb5addr.lo
++libgssapi_la_OBJECTS = $(am_libgssapi_la_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libgssapi_la_SOURCES)
++MANS = $(man_MANS)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libgssapi_la_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/gssapi/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/gssapi/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/gssapi/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -471,8 +434,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -487,19 +450,19 @@
+ 	$(LINK) -rpath $(libdir) $(libgssapi_la_LDFLAGS) $(libgssapi_la_OBJECTS) $(libgssapi_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -510,9 +473,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man3dir = $(mandir)/man3
+ install-man3: $(man3_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+ 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -531,8 +496,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
+ uninstall-man3:
+ 	@$(NORMAL_UNINSTALL)
+@@ -552,27 +517,36 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -581,7 +555,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -596,6 +569,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -618,9 +592,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -632,7 +610,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -654,10 +632,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -696,8 +673,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -740,18 +715,17 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am \
+-	install-includeHEADERS install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-man3 install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
+-	uninstall-man3
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-includeHEADERS install-info \
++	install-info-am install-libLTLIBRARIES install-man install-man3 \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-includeHEADERS uninstall-info-am \
++	uninstall-libLTLIBRARIES uninstall-man uninstall-man3
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/hdb/Makefile.in heimdal-0.6.3/lib/hdb/Makefile.in
+--- heimdal-0.6.3-old/lib/hdb/Makefile.in	2004-09-13 22:29:28.000000000 +1000
++++ heimdal-0.6.3/lib/hdb/Makefile.in	2004-09-14 08:39:59.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libhdb_la_SOURCES) convert_db.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,92 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-noinst_PROGRAMS = convert_db$(EXEEXT)
+-subdir = lib/hdb
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libhdb_la_DEPENDENCIES = ../krb5/libkrb5.la ../asn1/libasn1.la \
+-	../roken/libroken.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am__objects_1 = asn1_Key.lo asn1_Event.lo asn1_HDBFlags.lo \
+-	asn1_hdb_entry.lo asn1_Salt.lo hdb_err.lo asn1_GENERATION.lo
+-am_libhdb_la_OBJECTS = common.lo db.lo db3.lo hdb-ldap.lo hdb.lo \
+-	keytab.lo mkey.lo ndbm.lo print.lo $(am__objects_1)
+-libhdb_la_OBJECTS = $(am_libhdb_la_OBJECTS)
+-PROGRAMS = $(noinst_PROGRAMS)
+-convert_db_SOURCES = convert_db.c
+-convert_db_OBJECTS = convert_db.$(OBJEXT)
+-convert_db_LDADD = $(LDADD)
+-convert_db_DEPENDENCIES = libhdb.la $(am__DEPENDENCIES_1) \
+-	../krb5/libkrb5.la ../asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libhdb_la_SOURCES) convert_db.c
+-DIST_SOURCES = $(libhdb_la_SOURCES) convert_db.c
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -155,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -165,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -188,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -206,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -214,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -262,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -342,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -350,30 +277,49 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_des) $(INCLUDE_openldap)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ BUILT_SOURCES = asn1_Key.c asn1_Event.c asn1_HDBFlags.c asn1_hdb_entry.c \
+ 	asn1_Salt.c hdb_err.c hdb_err.h asn1_GENERATION.c
+ 
++
+ foo = asn1_Key.x asn1_GENERATION.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x asn1_Salt.x
++
+ CLEANFILES = $(BUILT_SOURCES) $(foo) hdb_asn1.h asn1_files
++
++noinst_PROGRAMS = convert_db
+ LDADD = libhdb.la \
+ 	$(LIB_openldap) \
+ 	../krb5/libkrb5.la \
+@@ -381,8 +327,10 @@
+ 	$(LIB_des) \
+ 	$(LIB_roken)
+ 
++
+ lib_LTLIBRARIES = libhdb.la
+ libhdb_la_LDFLAGS = -version-info 7:7:0
++
+ libhdb_la_SOURCES = \
+ 	common.c				\
+ 	db.c					\
+@@ -395,50 +343,70 @@
+ 	print.c					\
+ 	$(BUILT_SOURCES)
+ 
++
+ include_HEADERS = hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h
+-libhdb_la_LIBADD = ../krb5/libkrb5.la ../asn1/libasn1.la ../roken/libroken.la $(LIB_openldap) $(DBLIB) $(LIB_NDBM)
++
++libhdb_la_LIBADD = ../krb5/libkrb5.la ../asn1/libasn1.la $(LIB_roken) $(LIB_openldap) $(DBLIB) $(LIB_NDBM)
++subdir = lib/hdb
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libhdb_la_DEPENDENCIES = ../krb5/libkrb5.la ../asn1/libasn1.la
++am__objects_1 = asn1_Key.lo asn1_Event.lo asn1_HDBFlags.lo \
++	asn1_hdb_entry.lo asn1_Salt.lo hdb_err.lo asn1_GENERATION.lo
++am_libhdb_la_OBJECTS = common.lo db.lo db3.lo hdb-ldap.lo hdb.lo \
++	keytab.lo mkey.lo ndbm.lo print.lo $(am__objects_1)
++libhdb_la_OBJECTS = $(am_libhdb_la_OBJECTS)
++noinst_PROGRAMS = convert_db$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++convert_db_SOURCES = convert_db.c
++convert_db_OBJECTS = convert_db.$(OBJEXT)
++convert_db_LDADD = $(LDADD)
++convert_db_DEPENDENCIES = libhdb.la ../krb5/libkrb5.la \
++	../asn1/libasn1.la
++convert_db_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libhdb_la_SOURCES) convert_db.c
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(libhdb_la_SOURCES) convert_db.c
++
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/hdb/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/hdb/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/hdb/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -446,8 +414,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -472,19 +440,19 @@
+ 	$(LINK) $(convert_db_LDFLAGS) $(convert_db_OBJECTS) $(convert_db_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -495,24 +463,33 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -521,7 +498,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -536,6 +512,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -558,9 +535,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -572,7 +553,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -595,10 +576,9 @@
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ install: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-am
+ install-exec: install-exec-am
+@@ -640,8 +620,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -684,8 +662,8 @@
+ 	clean clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	dvi-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am \
+ 	install-includeHEADERS install-info install-info-am \
+ 	install-libLTLIBRARIES install-man install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+diff -ruN heimdal-0.6.3-old/lib/kadm5/Makefile.in heimdal-0.6.3/lib/kadm5/Makefile.in
+--- heimdal-0.6.3-old/lib/kadm5/Makefile.in	2004-09-13 22:29:29.000000000 +1000
++++ heimdal-0.6.3/lib/kadm5/Makefile.in	2004-09-14 08:40:00.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libkadm5clnt_la_SOURCES) $(libkadm5srv_la_SOURCES) $(dump_log_SOURCES) $(ipropd_master_SOURCES) $(ipropd_slave_SOURCES) $(replay_log_SOURCES) $(truncate_log_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,151 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(kadm5include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-sbin_PROGRAMS = dump_log$(EXEEXT) replay_log$(EXEEXT) \
+-	truncate_log$(EXEEXT)
+-libexec_PROGRAMS = ipropd-master$(EXEEXT) ipropd-slave$(EXEEXT)
+-subdir = lib/kadm5
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(kadm5includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libkadm5clnt_la_DEPENDENCIES = ../krb5/libkrb5.la ../hdb/libhdb.la \
+-	../roken/libroken.la
+-am__objects_1 = chpass_c.lo common_glue.lo create_c.lo delete_c.lo \
+-	destroy_c.lo flush_c.lo free.lo get_c.lo get_princs_c.lo \
+-	init_c.lo kadm5_err.lo marshall.lo modify_c.lo privs_c.lo \
+-	randkey_c.lo rename_c.lo send_recv.lo
+-am_libkadm5clnt_la_OBJECTS = $(am__objects_1) client_glue.lo
+-libkadm5clnt_la_OBJECTS = $(am_libkadm5clnt_la_OBJECTS)
+-libkadm5srv_la_DEPENDENCIES = ../krb5/libkrb5.la ../hdb/libhdb.la \
+-	../roken/libroken.la
+-am__objects_2 = acl.lo bump_pw_expire.lo chpass_s.lo common_glue.lo \
+-	context_s.lo create_s.lo delete_s.lo destroy_s.lo ent_setup.lo \
+-	error.lo flush_s.lo free.lo get_princs_s.lo get_s.lo init_s.lo \
+-	kadm5_err.lo keys.lo log.lo marshall.lo modify_s.lo privs_s.lo \
+-	randkey_s.lo rename_s.lo set_keys.lo set_modifier.lo \
+-	password_quality.lo
+-am_libkadm5srv_la_OBJECTS = $(am__objects_2) server_glue.lo
+-libkadm5srv_la_OBJECTS = $(am_libkadm5srv_la_OBJECTS)
+-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS)
+-am_dump_log_OBJECTS = dump_log.$(OBJEXT)
+-dump_log_OBJECTS = $(am_dump_log_OBJECTS)
+-dump_log_LDADD = $(LDADD)
+-am__DEPENDENCIES_1 =
+-dump_log_DEPENDENCIES = libkadm5srv.la \
+-	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_ipropd_master_OBJECTS = ipropd_master.$(OBJEXT)
+-ipropd_master_OBJECTS = $(am_ipropd_master_OBJECTS)
+-ipropd_master_LDADD = $(LDADD)
+-ipropd_master_DEPENDENCIES = libkadm5srv.la \
+-	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_ipropd_slave_OBJECTS = ipropd_slave.$(OBJEXT)
+-ipropd_slave_OBJECTS = $(am_ipropd_slave_OBJECTS)
+-ipropd_slave_LDADD = $(LDADD)
+-ipropd_slave_DEPENDENCIES = libkadm5srv.la \
+-	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_replay_log_OBJECTS = replay_log.$(OBJEXT)
+-replay_log_OBJECTS = $(am_replay_log_OBJECTS)
+-replay_log_LDADD = $(LDADD)
+-replay_log_DEPENDENCIES = libkadm5srv.la \
+-	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-am_truncate_log_OBJECTS = truncate_log.$(OBJEXT)
+-truncate_log_OBJECTS = $(am_truncate_log_OBJECTS)
+-truncate_log_LDADD = $(LDADD)
+-truncate_log_DEPENDENCIES = libkadm5srv.la \
+-	$(top_builddir)/lib/hdb/libhdb.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libkadm5clnt_la_SOURCES) $(libkadm5srv_la_SOURCES) \
+-	$(dump_log_SOURCES) $(ipropd_master_SOURCES) \
+-	$(ipropd_slave_SOURCES) $(replay_log_SOURCES) \
+-	$(truncate_log_SOURCES)
+-DIST_SOURCES = $(libkadm5clnt_la_SOURCES) $(libkadm5srv_la_SOURCES) \
+-	$(dump_log_SOURCES) $(ipropd_master_SOURCES) \
+-	$(ipropd_slave_SOURCES) $(replay_log_SOURCES) \
+-	$(truncate_log_SOURCES)
+-kadm5includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(kadm5include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -214,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -224,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -247,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -265,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -273,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -321,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -401,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -409,35 +277,57 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la
+ libkadm5srv_la_LDFLAGS = -version-info 7:6:0
+ libkadm5clnt_la_LDFLAGS = -version-info 6:4:2
+-libkadm5srv_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la ../roken/libroken.la
+-libkadm5clnt_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la ../roken/libroken.la
++sbin_PROGRAMS = dump_log replay_log truncate_log
++
++libkadm5srv_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la $(LIB_roken)
++libkadm5clnt_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la $(LIB_roken)
++
++libexec_PROGRAMS = ipropd-master ipropd-slave
++
+ kadm5includedir = $(includedir)/kadm5
+ buildkadm5include = $(buildinclude)/kadm5
++
+ kadm5include_HEADERS = kadm5_err.h admin.h private.h \
+ 	kadm5-protos.h kadm5-private.h
+ 
++
+ SOURCES_client = \
+ 	admin.h					\
+ 	chpass_c.c				\
+@@ -460,6 +350,7 @@
+ 	rename_c.c				\
+ 	send_recv.c
+ 
++
+ SOURCES_server = \
+ 	acl.c					\
+ 	admin.h					\
+@@ -491,13 +382,20 @@
+ 	set_modifier.c				\
+ 	password_quality.c
+ 
++
+ libkadm5srv_la_SOURCES = $(SOURCES_server) server_glue.c
+ libkadm5clnt_la_SOURCES = $(SOURCES_client) client_glue.c
++
+ dump_log_SOURCES = dump_log.c kadm5_locl.h
++
+ replay_log_SOURCES = replay_log.c kadm5_locl.h
++
+ ipropd_master_SOURCES = ipropd_master.c iprop.h kadm5_locl.h
++
+ ipropd_slave_SOURCES = ipropd_slave.c iprop.h kadm5_locl.h
++
+ truncate_log_SOURCES = truncate_log.c
++
+ LDADD = \
+ 	libkadm5srv.la \
+ 	$(top_builddir)/lib/hdb/libhdb.la \
+@@ -510,49 +408,117 @@
+ 	$(LIB_dlopen) \
+ 	$(LIB_pidfile)
+ 
++
+ CLEANFILES = kadm5_err.c kadm5_err.h
++
+ proto_opts = -q -R '^(_|kadm5_c_|kadm5_s_|kadm5_log)' -P comment
++subdir = lib/kadm5
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libkadm5clnt_la_DEPENDENCIES = ../krb5/libkrb5.la ../hdb/libhdb.la
++am__objects_1 = chpass_c.lo common_glue.lo create_c.lo delete_c.lo \
++	destroy_c.lo flush_c.lo free.lo get_c.lo get_princs_c.lo \
++	init_c.lo kadm5_err.lo marshall.lo modify_c.lo privs_c.lo \
++	randkey_c.lo rename_c.lo send_recv.lo
++am_libkadm5clnt_la_OBJECTS = $(am__objects_1) client_glue.lo
++libkadm5clnt_la_OBJECTS = $(am_libkadm5clnt_la_OBJECTS)
++libkadm5srv_la_DEPENDENCIES = ../krb5/libkrb5.la ../hdb/libhdb.la
++am__objects_2 = acl.lo bump_pw_expire.lo chpass_s.lo common_glue.lo \
++	context_s.lo create_s.lo delete_s.lo destroy_s.lo ent_setup.lo \
++	error.lo flush_s.lo free.lo get_princs_s.lo get_s.lo init_s.lo \
++	kadm5_err.lo keys.lo log.lo marshall.lo modify_s.lo privs_s.lo \
++	randkey_s.lo rename_s.lo set_keys.lo set_modifier.lo \
++	password_quality.lo
++am_libkadm5srv_la_OBJECTS = $(am__objects_2) server_glue.lo
++libkadm5srv_la_OBJECTS = $(am_libkadm5srv_la_OBJECTS)
++libexec_PROGRAMS = ipropd-master$(EXEEXT) ipropd-slave$(EXEEXT)
++sbin_PROGRAMS = dump_log$(EXEEXT) replay_log$(EXEEXT) \
++	truncate_log$(EXEEXT)
++PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS)
++
++am_dump_log_OBJECTS = dump_log.$(OBJEXT)
++dump_log_OBJECTS = $(am_dump_log_OBJECTS)
++dump_log_LDADD = $(LDADD)
++dump_log_DEPENDENCIES = libkadm5srv.la $(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++dump_log_LDFLAGS =
++am_ipropd_master_OBJECTS = ipropd_master.$(OBJEXT)
++ipropd_master_OBJECTS = $(am_ipropd_master_OBJECTS)
++ipropd_master_LDADD = $(LDADD)
++ipropd_master_DEPENDENCIES = libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++ipropd_master_LDFLAGS =
++am_ipropd_slave_OBJECTS = ipropd_slave.$(OBJEXT)
++ipropd_slave_OBJECTS = $(am_ipropd_slave_OBJECTS)
++ipropd_slave_LDADD = $(LDADD)
++ipropd_slave_DEPENDENCIES = libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++ipropd_slave_LDFLAGS =
++am_replay_log_OBJECTS = replay_log.$(OBJEXT)
++replay_log_OBJECTS = $(am_replay_log_OBJECTS)
++replay_log_LDADD = $(LDADD)
++replay_log_DEPENDENCIES = libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++replay_log_LDFLAGS =
++am_truncate_log_OBJECTS = truncate_log.$(OBJEXT)
++truncate_log_OBJECTS = $(am_truncate_log_OBJECTS)
++truncate_log_LDADD = $(LDADD)
++truncate_log_DEPENDENCIES = libkadm5srv.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(top_builddir)/lib/krb5/libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++truncate_log_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libkadm5clnt_la_SOURCES) $(libkadm5srv_la_SOURCES) \
++	$(dump_log_SOURCES) $(ipropd_master_SOURCES) \
++	$(ipropd_slave_SOURCES) $(replay_log_SOURCES) \
++	$(truncate_log_SOURCES)
++HEADERS = $(kadm5include_HEADERS)
++
++DIST_COMMON = $(kadm5include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libkadm5clnt_la_SOURCES) $(libkadm5srv_la_SOURCES) $(dump_log_SOURCES) $(ipropd_master_SOURCES) $(ipropd_slave_SOURCES) $(replay_log_SOURCES) $(truncate_log_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/kadm5/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/kadm5/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/kadm5/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -560,8 +526,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -576,17 +542,18 @@
+ 	$(LINK) -rpath $(libdir) $(libkadm5clnt_la_LDFLAGS) $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_LIBADD) $(LIBS)
+ libkadm5srv.la: $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libkadm5srv_la_LDFLAGS) $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_LIBADD) $(LIBS)
++libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-libexecPROGRAMS: $(libexec_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -594,8 +561,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \
++	  rm -f $(DESTDIR)$(libexecdir)/$$f; \
+ 	done
+ 
+ clean-libexecPROGRAMS:
+@@ -604,17 +571,18 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
++sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
++	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -622,8 +590,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \
++	  rm -f $(DESTDIR)$(sbindir)/$$f; \
+ 	done
+ 
+ clean-sbinPROGRAMS:
+@@ -649,19 +617,19 @@
+ 	$(LINK) $(truncate_log_LDFLAGS) $(truncate_log_OBJECTS) $(truncate_log_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -672,24 +640,33 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++kadm5includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-kadm5includeHEADERS: $(kadm5include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(kadm5includedir)" || $(mkdir_p) "$(DESTDIR)$(kadm5includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(kadm5includedir)
+ 	@list='$(kadm5include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(kadm5includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(kadm5includedir)/$$f'"; \
+-	  $(kadm5includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(kadm5includedir)/$$f"; \
++	  echo " $(kadm5includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(kadm5includedir)/$$f"; \
++	  $(kadm5includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(kadm5includedir)/$$f; \
+ 	done
+ 
+ uninstall-kadm5includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(kadm5include_HEADERS)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(kadm5includedir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(kadm5includedir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(kadm5includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(kadm5includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -698,7 +675,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -713,6 +689,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -735,9 +712,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -749,7 +730,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -771,10 +752,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(kadm5includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(sbindir) $(DESTDIR)$(kadm5includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -814,8 +794,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -860,18 +838,17 @@
+ 	clean clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \
+ 	clean-libtool clean-sbinPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am \
+ 	install-kadm5includeHEADERS install-libLTLIBRARIES \
+ 	install-libexecPROGRAMS install-man install-sbinPROGRAMS \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-kadm5includeHEADERS \
+-	uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \
+-	uninstall-sbinPROGRAMS
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
++	uninstall-kadm5includeHEADERS uninstall-libLTLIBRARIES \
++	uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/kafs/Makefile.in heimdal-0.6.3/lib/kafs/Makefile.in
+--- heimdal-0.6.3-old/lib/kafs/Makefile.in	2004-09-13 22:29:30.000000000 +1000
++++ heimdal-0.6.3/lib/kafs/Makefile.in	2004-09-14 08:40:00.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libkafs_la_SOURCES) $(EXTRA_libkafs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,99 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-subdir = lib/kafs
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(foodir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-@KRB5_TRUE@am__DEPENDENCIES_1 = ../krb5/libkrb5.la
+-am__DEPENDENCIES_2 =
+-@KRB4_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) \
+-@KRB4_TRUE@	$(am__DEPENDENCIES_2)
+-libkafs_la_DEPENDENCIES = $(am__DEPENDENCIES_1) ../roken/libroken.la \
+-	$(am__DEPENDENCIES_3)
+-am__libkafs_la_SOURCES_DIST = afssys.c afskrb.c afskrb5.c common.c \
+-	afslib.c dlfcn.c kafs_locl.h afssysdefs.h resolve.c strtok_r.c \
+-	strlcpy.c strsep.c
+-@KRB4_TRUE@am__objects_1 = afskrb.lo
+-@KRB5_TRUE@am__objects_2 = afskrb5.lo
+-@AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@am__objects_3 = afslib.lo
+-@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@am__objects_3 =  \
+-@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@	dlfcn.lo
+-@do_roken_rename_TRUE@am__objects_4 = resolve.lo strtok_r.lo \
+-@do_roken_rename_TRUE@	strlcpy.lo strsep.lo
+-am_libkafs_la_OBJECTS = afssys.lo $(am__objects_1) $(am__objects_2) \
+-	common.lo $(am__objects_3) $(am__objects_4)
+-libkafs_la_OBJECTS = $(am_libkafs_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libkafs_la_SOURCES) $(EXTRA_libkafs_la_SOURCES)
+-DIST_SOURCES = $(am__libkafs_la_SOURCES_DIST) \
+-	$(EXTRA_libkafs_la_SOURCES)
+-man3dir = $(mandir)/man3
+-MANS = $(man_MANS)
+-fooDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(foo_DATA)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -162,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -172,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -195,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -213,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -221,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -269,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -349,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -357,56 +277,84 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(AFS_EXTRA_DEFS) $(ROKEN_RENAME) $(krb4_am_workaround) $(krb5_am_workaround)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
+-@KRB4_FALSE@DEPLIB_krb4 = 
++
+ @KRB4_TRUE@DEPLIB_krb4 = $(LIB_krb4) $(LIB_des)
+-@KRB4_FALSE@krb4_am_workaround = 
++@KRB4_FALSE@DEPLIB_krb4 = 
+ @KRB4_TRUE@krb4_am_workaround = $(INCLUDE_krb4)
+-@KRB5_FALSE@DEPLIB_krb5 = 
++@KRB4_FALSE@krb4_am_workaround = 
++
+ @KRB5_TRUE@DEPLIB_krb5 = ../krb5/libkrb5.la 
+-@KRB5_FALSE@krb5_am_workaround = 
++@KRB5_FALSE@DEPLIB_krb5 = 
+ @KRB5_TRUE@krb5_am_workaround = $(INCLUDE_des) -I$(top_srcdir)/lib/krb5
+-@AIX_FALSE@AFSL_EXP = 
++@KRB5_FALSE@krb5_am_workaround = 
++
+ @AIX_TRUE@AFSL_EXP = $(srcdir)/afsl.exp
++
++@AIX_FALSE@AFSL_EXP = 
+ @AIX4_FALSE@@AIX_TRUE@AFS_EXTRA_LD = -e _nostart
++
+ @AIX4_TRUE@@AIX_TRUE@AFS_EXTRA_LD = -bnoentry
+ @AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@AIX_SRC = afslib.c
++@AIX_FALSE@AIX_SRC = 
+ @AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@AIX_SRC = dlfcn.c
++
+ @AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_TRUE@AIX_SRC = 
+-@AIX_FALSE@AIX_SRC = 
+ @AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@AFS_EXTRA_LIBS = 
+ @AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@AFS_EXTRA_LIBS = afslib.so
+ @AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@AFS_EXTRA_DEFS = -DSTATIC_AFS
+ @AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@AFS_EXTRA_DEFS = 
+-libkafs_la_LIBADD = $(DEPLIB_krb5) ../roken/libroken.la $(DEPLIB_krb4)
++
++libkafs_la_LIBADD = $(DEPLIB_krb5) $(LIB_roken) $(DEPLIB_krb4)
++
+ lib_LTLIBRARIES = libkafs.la
+ libkafs_la_LDFLAGS = -version-info 4:0:4
+ foodir = $(libdir)
+ foo_DATA = $(AFS_EXTRA_LIBS)
++
+ # EXTRA_DATA = afslib.so
+ CLEANFILES = $(AFS_EXTRA_LIBS) $(ROKEN_SRCS)
++
+ include_HEADERS = kafs.h
++
+ @KRB5_TRUE@afskrb5_c = afskrb5.c
++
+ @KRB4_TRUE@afskrb_c = afskrb.c
++
+ @do_roken_rename_TRUE@ROKEN_SRCS = resolve.c strtok_r.c strlcpy.c strsep.c
++
+ libkafs_la_SOURCES = \
+ 	afssys.c				\
+ 	$(afskrb_c)				\
+@@ -418,51 +366,80 @@
+ 	$(ROKEN_SRCS)
+ 
+ 
++
+ #afslib_so_SOURCES = afslib.c
+ EXTRA_libkafs_la_SOURCES = afskrb.c afskrb5.c dlfcn.c afslib.c dlfcn.h
++
+ EXTRA_DIST = README.dlfcn afsl.exp afslib.exp
++
+ man_MANS = kafs.3
++subdir = lib/kafs
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++@KRB4_FALSE@@KRB5_TRUE@libkafs_la_DEPENDENCIES = ../krb5/libkrb5.la
++@KRB4_FALSE@@KRB5_FALSE@libkafs_la_DEPENDENCIES =
++@KRB4_TRUE@@KRB5_TRUE@libkafs_la_DEPENDENCIES = ../krb5/libkrb5.la
++@KRB4_TRUE@@KRB5_FALSE@libkafs_la_DEPENDENCIES =
++am__libkafs_la_SOURCES_DIST = afssys.c afskrb.c afskrb5.c common.c \
++	afslib.c dlfcn.c kafs_locl.h afssysdefs.h resolve.c strtok_r.c \
++	strlcpy.c strsep.c
++@KRB4_TRUE@am__objects_1 = afskrb.lo
++@KRB5_TRUE@am__objects_2 = afskrb5.lo
++@AIX_FALSE@am__objects_3 =
++@AIX_DYNAMIC_AFS_FALSE@@AIX_TRUE@am__objects_3 = afslib.lo
++@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_TRUE@am__objects_3 =
++@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@am__objects_3 = \
++@AIX_DYNAMIC_AFS_TRUE@@AIX_TRUE@@HAVE_DLOPEN_FALSE@	dlfcn.lo
++@do_roken_rename_TRUE@am__objects_4 = resolve.lo strtok_r.lo strlcpy.lo \
++@do_roken_rename_TRUE@	strsep.lo
++am_libkafs_la_OBJECTS = afssys.lo $(am__objects_1) $(am__objects_2) \
++	common.lo $(am__objects_3) $(am__objects_4)
++libkafs_la_OBJECTS = $(am_libkafs_la_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__libkafs_la_SOURCES_DIST) \
++	$(EXTRA_libkafs_la_SOURCES)
++MANS = $(man_MANS)
++DATA = $(foo_DATA)
++
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libkafs_la_SOURCES) $(EXTRA_libkafs_la_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/kafs/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/kafs/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/kafs/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -470,8 +447,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -486,19 +463,19 @@
+ 	$(LINK) -rpath $(libdir) $(libkafs_la_LDFLAGS) $(libkafs_la_OBJECTS) $(libkafs_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -509,9 +486,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man3dir = $(mandir)/man3
+ install-man3: $(man3_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+ 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -530,8 +509,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
+ uninstall-man3:
+ 	@$(NORMAL_UNINSTALL)
+@@ -551,44 +530,54 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
++fooDATA_INSTALL = $(INSTALL_DATA)
+ install-fooDATA: $(foo_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(foodir)" || $(mkdir_p) "$(DESTDIR)$(foodir)"
++	$(mkinstalldirs) $(DESTDIR)$(foodir)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(fooDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(foodir)/$$f'"; \
+-	  $(fooDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f"; \
++	  $(fooDATA_INSTALL) $$d$$p $(DESTDIR)$(foodir)/$$f; \
+ 	done
+ 
+ uninstall-fooDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(foo_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(foodir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(foodir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(foodir)/$$f"; \
++	  rm -f $(DESTDIR)$(foodir)/$$f; \
+ 	done
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -597,7 +586,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -612,6 +600,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -634,9 +623,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -648,7 +641,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -670,10 +663,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(foodir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) $(DESTDIR)$(foodir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -713,8 +705,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -757,18 +747,18 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-fooDATA \
+-	install-includeHEADERS install-info install-info-am \
+-	install-libLTLIBRARIES install-man install-man3 install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-fooDATA \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-man uninstall-man3
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-fooDATA install-includeHEADERS \
++	install-info install-info-am install-libLTLIBRARIES install-man \
++	install-man3 install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-fooDATA uninstall-includeHEADERS \
++	uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
++	uninstall-man3
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/kdfs/Makefile.in heimdal-0.6.3/lib/kdfs/Makefile.in
+--- heimdal-0.6.3-old/lib/kdfs/Makefile.in	2004-09-13 22:29:31.000000000 +1000
++++ heimdal-0.6.3/lib/kdfs/Makefile.in	2004-09-14 08:40:01.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,8 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-SOURCES = $(libkdfs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -29,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -43,76 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-subdir = lib/kdfs
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libkdfs_la_LIBADD =
+-am_libkdfs_la_OBJECTS = k5dfspag.lo
+-libkdfs_la_OBJECTS = $(am_libkdfs_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libkdfs_la_SOURCES)
+-DIST_SOURCES = $(libkdfs_la_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -137,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -147,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -170,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -188,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -196,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -244,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -324,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -332,71 +277,91 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ lib_LTLIBRARIES = libkdfs.la
++
+ libkdfs_la_SOURCES = \
+ 	k5dfspag.c
+ 
++
+ libkdfs_la_LDFLAGS = -version-info 0:2:0
++subdir = lib/kdfs
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libkdfs_la_LIBADD =
++am_libkdfs_la_OBJECTS = k5dfspag.lo
++libkdfs_la_OBJECTS = $(am_libkdfs_la_OBJECTS)
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libkdfs_la_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libkdfs_la_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/kdfs/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/kdfs/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/kdfs/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -404,8 +369,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -420,19 +385,19 @@
+ 	$(LINK) -rpath $(libdir) $(libkdfs_la_LDFLAGS) $(libkdfs_la_OBJECTS) $(libkdfs_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -444,6 +409,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -452,7 +425,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -467,6 +439,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -489,9 +462,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -503,7 +480,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -525,10 +502,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -567,8 +543,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -608,16 +582,16 @@
+ 
+ .PHONY: CTAGS GTAGS all all-am all-local check check-am check-local \
+ 	clean clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+-	distclean distclean-compile distclean-generic \
+-	distclean-libtool distclean-tags distdir dvi dvi-am html \
+-	html-am info info-am install install-am install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-info-am uninstall-libLTLIBRARIES
++	distclean distclean-compile distclean-generic distclean-libtool \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am \
++	install-libLTLIBRARIES install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am \
++	uninstall-libLTLIBRARIES
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/krb5/Makefile.in heimdal-0.6.3/lib/krb5/Makefile.in
+--- heimdal-0.6.3-old/lib/krb5/Makefile.in	2004-09-13 22:29:32.000000000 +1000
++++ heimdal-0.6.3/lib/krb5/Makefile.in	2004-09-14 08:40:01.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libkrb5_la_SOURCES) aes-test.c derived-key-test.c dump_config.c krbhst-test.c n-fold-test.c name-45-test.c parse-name-test.c store-test.c string-to-key-test.c test_alname.c test_cc.c test_get_addrs.c verify_krb5_conf.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,190 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-bin_PROGRAMS = verify_krb5_conf$(EXEEXT)
+-noinst_PROGRAMS = dump_config$(EXEEXT) test_get_addrs$(EXEEXT) \
+-	krbhst-test$(EXEEXT) test_alname$(EXEEXT)
+-check_PROGRAMS = $(am__EXEEXT_1)
+-subdir = lib/krb5
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libkrb5_la_DEPENDENCIES = ../com_err/error.lo ../com_err/com_err.lo \
+-	$(am__DEPENDENCIES_1) $(top_builddir)/lib/asn1/libasn1.la \
+-	$(am__DEPENDENCIES_1)
+-am__objects_1 = krb5_err.lo heim_err.lo k524_err.lo
+-am_libkrb5_la_OBJECTS = acl.lo add_et_list.lo addr_families.lo \
+-	aname_to_localname.lo appdefault.lo asn1_glue.lo \
+-	auth_context.lo build_ap_req.lo build_auth.lo cache.lo \
+-	changepw.lo codec.lo config_file.lo config_file_netinfo.lo \
+-	convert_creds.lo constants.lo context.lo copy_host_realm.lo \
+-	crc.lo creds.lo crypto.lo data.lo eai_to_heim_errno.lo \
+-	error_string.lo expand_hostname.lo fcache.lo free.lo \
+-	free_host_realm.lo generate_seq_number.lo generate_subkey.lo \
+-	get_addrs.lo get_cred.lo get_default_principal.lo \
+-	get_default_realm.lo get_for_creds.lo get_host_realm.lo \
+-	get_in_tkt.lo get_in_tkt_pw.lo get_in_tkt_with_keytab.lo \
+-	get_in_tkt_with_skey.lo get_port.lo init_creds.lo \
+-	init_creds_pw.lo keyblock.lo keytab.lo keytab_any.lo \
+-	keytab_file.lo keytab_memory.lo keytab_keyfile.lo \
+-	keytab_krb4.lo krbhst.lo kuserok.lo log.lo mcache.lo misc.lo \
+-	mk_error.lo mk_priv.lo mk_rep.lo mk_req.lo mk_req_ext.lo \
+-	mk_safe.lo net_read.lo net_write.lo n-fold.lo padata.lo \
+-	principal.lo prog_setup.lo prompter_posix.lo rd_cred.lo \
+-	rd_error.lo rd_priv.lo rd_rep.lo rd_req.lo rd_safe.lo \
+-	read_message.lo recvauth.lo replay.lo send_to_kdc.lo \
+-	sendauth.lo set_default_realm.lo sock_principal.lo store.lo \
+-	store_emem.lo store_fd.lo store_mem.lo ticket.lo time.lo \
+-	transited.lo verify_init.lo verify_user.lo version.lo warn.lo \
+-	write_message.lo $(am__objects_1)
+-libkrb5_la_OBJECTS = $(am_libkrb5_la_OBJECTS)
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-am__EXEEXT_1 = aes-test$(EXEEXT) n-fold-test$(EXEEXT) \
+-	string-to-key-test$(EXEEXT) derived-key-test$(EXEEXT) \
+-	store-test$(EXEEXT) parse-name-test$(EXEEXT) test_cc$(EXEEXT) \
+-	name-45-test$(EXEEXT)
+-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+-aes_test_SOURCES = aes-test.c
+-aes_test_OBJECTS = aes-test.$(OBJEXT)
+-aes_test_LDADD = $(LDADD)
+-aes_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-derived_key_test_SOURCES = derived-key-test.c
+-derived_key_test_OBJECTS = derived-key-test.$(OBJEXT)
+-derived_key_test_LDADD = $(LDADD)
+-derived_key_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-dump_config_SOURCES = dump_config.c
+-dump_config_OBJECTS = dump_config.$(OBJEXT)
+-dump_config_LDADD = $(LDADD)
+-dump_config_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-krbhst_test_SOURCES = krbhst-test.c
+-krbhst_test_OBJECTS = krbhst-test.$(OBJEXT)
+-krbhst_test_LDADD = $(LDADD)
+-krbhst_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-n_fold_test_SOURCES = n-fold-test.c
+-n_fold_test_OBJECTS = n-fold-test.$(OBJEXT)
+-n_fold_test_LDADD = $(LDADD)
+-n_fold_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-name_45_test_SOURCES = name-45-test.c
+-name_45_test_OBJECTS = name-45-test.$(OBJEXT)
+-name_45_test_LDADD = $(LDADD)
+-name_45_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-parse_name_test_SOURCES = parse-name-test.c
+-parse_name_test_OBJECTS = parse-name-test.$(OBJEXT)
+-parse_name_test_LDADD = $(LDADD)
+-parse_name_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-store_test_SOURCES = store-test.c
+-store_test_OBJECTS = store-test.$(OBJEXT)
+-store_test_LDADD = $(LDADD)
+-store_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-string_to_key_test_SOURCES = string-to-key-test.c
+-string_to_key_test_OBJECTS = string-to-key-test.$(OBJEXT)
+-string_to_key_test_LDADD = $(LDADD)
+-string_to_key_test_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-test_alname_SOURCES = test_alname.c
+-test_alname_OBJECTS = test_alname.$(OBJEXT)
+-test_alname_LDADD = $(LDADD)
+-test_alname_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-test_cc_SOURCES = test_cc.c
+-test_cc_OBJECTS = test_cc.$(OBJEXT)
+-test_cc_LDADD = $(LDADD)
+-test_cc_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-test_get_addrs_SOURCES = test_get_addrs.c
+-test_get_addrs_OBJECTS = test_get_addrs.$(OBJEXT)
+-test_get_addrs_LDADD = $(LDADD)
+-test_get_addrs_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-verify_krb5_conf_SOURCES = verify_krb5_conf.c
+-verify_krb5_conf_OBJECTS = verify_krb5_conf.$(OBJEXT)
+-verify_krb5_conf_LDADD = $(LDADD)
+-verify_krb5_conf_DEPENDENCIES = libkrb5.la $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/lib/asn1/libasn1.la $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libkrb5_la_SOURCES) aes-test.c derived-key-test.c \
+-	dump_config.c krbhst-test.c n-fold-test.c name-45-test.c \
+-	parse-name-test.c store-test.c string-to-key-test.c \
+-	test_alname.c test_cc.c test_get_addrs.c verify_krb5_conf.c
+-DIST_SOURCES = $(libkrb5_la_SOURCES) aes-test.c derived-key-test.c \
+-	dump_config.c krbhst-test.c n-fold-test.c name-45-test.c \
+-	parse-name-test.c store-test.c string-to-key-test.c \
+-	test_alname.c test_cc.c test_get_addrs.c verify_krb5_conf.c
+-man3dir = $(mandir)/man3
+-man5dir = $(mandir)/man5
+-man8dir = $(mandir)/man8
+-MANS = $(man_MANS)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -253,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -263,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -286,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -304,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -312,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -360,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -440,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -448,25 +277,44 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4) $(INCLUDE_des) -I../com_err -I$(srcdir)/../com_err
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++bin_PROGRAMS = verify_krb5_conf
++
++noinst_PROGRAMS = dump_config test_get_addrs krbhst-test test_alname
++
+ TESTS = \
+ 	aes-test				\
+ 	n-fold-test				\
+@@ -477,19 +325,26 @@
+ 	test_cc					\
+ 	name-45-test
+ 
++
++check_PROGRAMS = $(TESTS)
++
+ LDADD = libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++
+ libkrb5_la_LIBADD = \
+-	../com_err/error.lo ../com_err/com_err.lo \
++	$(LIB_com_err) \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+ 	$(LIB_roken)
+ 
++
+ lib_LTLIBRARIES = libkrb5.la
++
+ ERR_FILES = krb5_err.c heim_err.c k524_err.c
++
+ libkrb5_la_SOURCES = \
+ 	acl.c					\
+ 	add_et_list.c				\
+@@ -587,8 +442,10 @@
+ 	write_message.c				\
+ 	$(ERR_FILES)
+ 
++
+ libkrb5_la_LDFLAGS = -version-info 20:0:3
+ 
++
+ #libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
+ man_MANS = \
+ 	kerberos.8				\
+@@ -627,49 +484,169 @@
+ 	krb5_warn.3				\
+ 	verify_krb5_conf.8
+ 
++
+ include_HEADERS = krb5.h krb5-protos.h krb5-private.h krb5_err.h heim_err.h k524_err.h
++
+ CLEANFILES = krb5_err.c krb5_err.h heim_err.c heim_err.h k524_err.c k524_err.h
++subdir = lib/krb5
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libkrb5_la_DEPENDENCIES = $(top_builddir)/lib/asn1/libasn1.la
++am__objects_1 = krb5_err.lo heim_err.lo k524_err.lo
++am_libkrb5_la_OBJECTS = acl.lo add_et_list.lo addr_families.lo \
++	aname_to_localname.lo appdefault.lo asn1_glue.lo \
++	auth_context.lo build_ap_req.lo build_auth.lo cache.lo \
++	changepw.lo codec.lo config_file.lo config_file_netinfo.lo \
++	convert_creds.lo constants.lo context.lo copy_host_realm.lo \
++	crc.lo creds.lo crypto.lo data.lo eai_to_heim_errno.lo \
++	error_string.lo expand_hostname.lo fcache.lo free.lo \
++	free_host_realm.lo generate_seq_number.lo generate_subkey.lo \
++	get_addrs.lo get_cred.lo get_default_principal.lo \
++	get_default_realm.lo get_for_creds.lo get_host_realm.lo \
++	get_in_tkt.lo get_in_tkt_pw.lo get_in_tkt_with_keytab.lo \
++	get_in_tkt_with_skey.lo get_port.lo init_creds.lo \
++	init_creds_pw.lo keyblock.lo keytab.lo keytab_any.lo \
++	keytab_file.lo keytab_memory.lo keytab_keyfile.lo \
++	keytab_krb4.lo krbhst.lo kuserok.lo log.lo mcache.lo misc.lo \
++	mk_error.lo mk_priv.lo mk_rep.lo mk_req.lo mk_req_ext.lo \
++	mk_safe.lo net_read.lo net_write.lo n-fold.lo padata.lo \
++	principal.lo prog_setup.lo prompter_posix.lo rd_cred.lo \
++	rd_error.lo rd_priv.lo rd_rep.lo rd_req.lo rd_safe.lo \
++	read_message.lo recvauth.lo replay.lo send_to_kdc.lo \
++	sendauth.lo set_default_realm.lo sock_principal.lo store.lo \
++	store_emem.lo store_fd.lo store_mem.lo ticket.lo time.lo \
++	transited.lo verify_init.lo verify_user.lo version.lo warn.lo \
++	write_message.lo $(am__objects_1)
++libkrb5_la_OBJECTS = $(am_libkrb5_la_OBJECTS)
++bin_PROGRAMS = verify_krb5_conf$(EXEEXT)
++check_PROGRAMS = aes-test$(EXEEXT) n-fold-test$(EXEEXT) \
++	string-to-key-test$(EXEEXT) derived-key-test$(EXEEXT) \
++	store-test$(EXEEXT) parse-name-test$(EXEEXT) test_cc$(EXEEXT) \
++	name-45-test$(EXEEXT)
++noinst_PROGRAMS = dump_config$(EXEEXT) test_get_addrs$(EXEEXT) \
++	krbhst-test$(EXEEXT) test_alname$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++
++aes_test_SOURCES = aes-test.c
++aes_test_OBJECTS = aes-test.$(OBJEXT)
++aes_test_LDADD = $(LDADD)
++aes_test_DEPENDENCIES = libkrb5.la $(top_builddir)/lib/asn1/libasn1.la
++aes_test_LDFLAGS =
++derived_key_test_SOURCES = derived-key-test.c
++derived_key_test_OBJECTS = derived-key-test.$(OBJEXT)
++derived_key_test_LDADD = $(LDADD)
++derived_key_test_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++derived_key_test_LDFLAGS =
++dump_config_SOURCES = dump_config.c
++dump_config_OBJECTS = dump_config.$(OBJEXT)
++dump_config_LDADD = $(LDADD)
++dump_config_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++dump_config_LDFLAGS =
++krbhst_test_SOURCES = krbhst-test.c
++krbhst_test_OBJECTS = krbhst-test.$(OBJEXT)
++krbhst_test_LDADD = $(LDADD)
++krbhst_test_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++krbhst_test_LDFLAGS =
++n_fold_test_SOURCES = n-fold-test.c
++n_fold_test_OBJECTS = n-fold-test.$(OBJEXT)
++n_fold_test_LDADD = $(LDADD)
++n_fold_test_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++n_fold_test_LDFLAGS =
++name_45_test_SOURCES = name-45-test.c
++name_45_test_OBJECTS = name-45-test.$(OBJEXT)
++name_45_test_LDADD = $(LDADD)
++name_45_test_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++name_45_test_LDFLAGS =
++parse_name_test_SOURCES = parse-name-test.c
++parse_name_test_OBJECTS = parse-name-test.$(OBJEXT)
++parse_name_test_LDADD = $(LDADD)
++parse_name_test_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++parse_name_test_LDFLAGS =
++store_test_SOURCES = store-test.c
++store_test_OBJECTS = store-test.$(OBJEXT)
++store_test_LDADD = $(LDADD)
++store_test_DEPENDENCIES = libkrb5.la $(top_builddir)/lib/asn1/libasn1.la
++store_test_LDFLAGS =
++string_to_key_test_SOURCES = string-to-key-test.c
++string_to_key_test_OBJECTS = string-to-key-test.$(OBJEXT)
++string_to_key_test_LDADD = $(LDADD)
++string_to_key_test_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++string_to_key_test_LDFLAGS =
++test_alname_SOURCES = test_alname.c
++test_alname_OBJECTS = test_alname.$(OBJEXT)
++test_alname_LDADD = $(LDADD)
++test_alname_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++test_alname_LDFLAGS =
++test_cc_SOURCES = test_cc.c
++test_cc_OBJECTS = test_cc.$(OBJEXT)
++test_cc_LDADD = $(LDADD)
++test_cc_DEPENDENCIES = libkrb5.la $(top_builddir)/lib/asn1/libasn1.la
++test_cc_LDFLAGS =
++test_get_addrs_SOURCES = test_get_addrs.c
++test_get_addrs_OBJECTS = test_get_addrs.$(OBJEXT)
++test_get_addrs_LDADD = $(LDADD)
++test_get_addrs_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++test_get_addrs_LDFLAGS =
++verify_krb5_conf_SOURCES = verify_krb5_conf.c
++verify_krb5_conf_OBJECTS = verify_krb5_conf.$(OBJEXT)
++verify_krb5_conf_LDADD = $(LDADD)
++verify_krb5_conf_DEPENDENCIES = libkrb5.la \
++	$(top_builddir)/lib/asn1/libasn1.la
++verify_krb5_conf_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libkrb5_la_SOURCES) aes-test.c derived-key-test.c \
++	dump_config.c krbhst-test.c n-fold-test.c name-45-test.c \
++	parse-name-test.c store-test.c string-to-key-test.c \
++	test_alname.c test_cc.c test_get_addrs.c verify_krb5_conf.c
++MANS = $(man_MANS)
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++SOURCES = $(libkrb5_la_SOURCES) aes-test.c derived-key-test.c dump_config.c krbhst-test.c n-fold-test.c name-45-test.c parse-name-test.c store-test.c string-to-key-test.c test_alname.c test_cc.c test_get_addrs.c verify_krb5_conf.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/krb5/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/krb5/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/krb5/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -677,8 +654,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -691,17 +668,18 @@
+ 	done
+ libkrb5.la: $(libkrb5_la_OBJECTS) $(libkrb5_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libkrb5_la_LDFLAGS) $(libkrb5_la_OBJECTS) $(libkrb5_la_LIBADD) $(LIBS)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -709,8 +687,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -774,19 +752,19 @@
+ 	$(LINK) $(verify_krb5_conf_LDFLAGS) $(verify_krb5_conf_OBJECTS) $(verify_krb5_conf_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -797,9 +775,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man3dir = $(mandir)/man3
+ install-man3: $(man3_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+ 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -818,8 +798,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
+ uninstall-man3:
+ 	@$(NORMAL_UNINSTALL)
+@@ -839,12 +819,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
++
++man5dir = $(mandir)/man5
+ install-man5: $(man5_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man5dir)
+ 	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -863,8 +845,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \
+ 	done
+ uninstall-man5:
+ 	@$(NORMAL_UNINSTALL)
+@@ -884,12 +866,14 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man5dir)/$$inst; \
+ 	done
++
++man8dir = $(mandir)/man8
+ install-man8: $(man8_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man8dir)
+ 	@list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -908,8 +892,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
+ uninstall-man8:
+ 	@$(NORMAL_UNINSTALL)
+@@ -929,27 +913,36 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man8dir)/$$inst; \
+ 	done
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -958,7 +951,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -973,6 +965,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -1009,24 +1002,24 @@
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xpass=`expr $$xpass + 1`; \
+-		failed=`expr $$failed + 1`; \
+-		echo "XPASS: $$tst"; \
++	        xpass=`expr $$xpass + 1`; \
++	        failed=`expr $$failed + 1`; \
++	        echo "XPASS: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		echo "PASS: $$tst"; \
++	        echo "PASS: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xfail=`expr $$xfail + 1`; \
+-		echo "XFAIL: $$tst"; \
++	        xfail=`expr $$xfail + 1`; \
++	        echo "XFAIL: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		failed=`expr $$failed + 1`; \
+-		echo "FAIL: $$tst"; \
++	        failed=`expr $$failed + 1`; \
++	        echo "FAIL: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    else \
+@@ -1068,9 +1061,13 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	else :; fi
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -1082,7 +1079,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -1104,14 +1101,12 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \
+-		all-local
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) all-local
+ install-binPROGRAMS: install-libLTLIBRARIES
+ 
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(man3dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -1152,8 +1147,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -1199,18 +1192,17 @@
+ 	clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-man3 install-man5 install-man8 install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-man uninstall-man3 \
+-	uninstall-man5 uninstall-man8
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-includeHEADERS install-info install-info-am \
++	install-libLTLIBRARIES install-man install-man3 install-man5 \
++	install-man8 install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \
++	uninstall-info-am uninstall-libLTLIBRARIES uninstall-man \
++	uninstall-man3 uninstall-man5 uninstall-man8
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/Makefile.in heimdal-0.6.3/lib/Makefile.in
+--- heimdal-0.6.3-old/lib/Makefile.in	2004-09-13 22:29:18.000000000 +1000
++++ heimdal-0.6.3/lib/Makefile.in	2004-09-14 08:39:54.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,69 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = lib
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = @DIR_roken@ vers editline @DIR_com_err@ sl asn1 \
+-	@DIR_des@ krb5 kafs hdb kadm5 gssapi auth 45 otp kdfs
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -127,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -137,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -160,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -178,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -186,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -234,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -314,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -322,64 +277,73 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ @KRB4_TRUE@dir_45 = 45
+-@OTP_TRUE@dir_otp = otp
+ @DCE_TRUE@dir_dce = kdfs
+-SUBDIRS = @DIR_roken@ vers editline @DIR_com_err@ sl asn1 @DIR_des@ krb5 \
+-	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+ 
++SUBDIRS = @DIR_roken@ vers @DIR_com_err@ @DIR_sl@ asn1 @DIR_des@ krb5 \
++	kafs hdb kadm5 gssapi auth $(dir_45) @DIR_otp@ $(dir_dce)
++
++subdir = lib
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
++DIST_SUBDIRS = @DIR_roken@ vers @DIR_com_err@ @DIR_sl@ asn1 @DIR_des@ \
++	krb5 kafs hdb kadm5 gssapi auth 45 @DIR_otp@ kdfs
+ all: all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -450,6 +414,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -458,7 +430,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -484,6 +455,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -506,9 +478,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -520,7 +496,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -537,13 +513,13 @@
+ 	done
+ 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -557,6 +533,7 @@
+ all-am: Makefile all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -594,8 +571,6 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -638,14 +613,18 @@
+ 	check-am check-local clean clean-generic clean-libtool \
+ 	clean-recursive ctags ctags-recursive distclean \
+ 	distclean-generic distclean-libtool distclean-recursive \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
++	info-recursive install install-am install-data install-data-am \
++	install-data-recursive install-exec install-exec-am \
++	install-exec-recursive install-info install-info-am \
++	install-info-recursive install-man install-recursive \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
++	tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/otp/Makefile.in heimdal-0.6.3/lib/otp/Makefile.in
+--- heimdal-0.6.3-old/lib/otp/Makefile.in	2004-09-13 22:29:34.000000000 +1000
++++ heimdal-0.6.3/lib/otp/Makefile.in	2004-09-14 08:40:02.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libotp_la_SOURCES) otptest.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,96 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-noinst_PROGRAMS = otptest$(EXEEXT)
+-check_PROGRAMS = otptest$(EXEEXT)
+-subdir = lib/otp
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libotp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+-am__libotp_la_SOURCES_DIST = otp.c otp_challenge.c otp_db.c otp_md.c \
+-	otp_parse.c otp_print.c otp_verify.c otp_locl.h otp_md.h \
+-	roken_rename.h ndbm_wrap.c ndbm_wrap.h snprintf.c strcasecmp.c \
+-	strncasecmp.c strlwr.c strlcpy.c strlcat.c
+-@HAVE_DB3_TRUE@am__objects_1 = ndbm_wrap.lo
+-@do_roken_rename_TRUE@am__objects_2 = snprintf.lo strcasecmp.lo \
+-@do_roken_rename_TRUE@	strncasecmp.lo strlwr.lo strlcpy.lo \
+-@do_roken_rename_TRUE@	strlcat.lo
+-am_libotp_la_OBJECTS = otp.lo otp_challenge.lo otp_db.lo otp_md.lo \
+-	otp_parse.lo otp_print.lo otp_verify.lo $(am__objects_1) \
+-	$(am__objects_2)
+-libotp_la_OBJECTS = $(am_libotp_la_OBJECTS)
+-PROGRAMS = $(noinst_PROGRAMS)
+-otptest_SOURCES = otptest.c
+-otptest_OBJECTS = otptest.$(OBJEXT)
+-otptest_DEPENDENCIES = libotp.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libotp_la_SOURCES) otptest.c
+-DIST_SOURCES = $(am__libotp_la_SOURCES_DIST) otptest.c
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -159,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -169,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -192,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -210,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -218,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -266,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -346,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -354,32 +277,55 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_des) $(ROKEN_RENAME)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
++noinst_PROGRAMS = otptest
++
++check_PROGRAMS = otptest
++
+ otptest_LDADD = libotp.la
++
+ include_HEADERS = otp.h
++
+ lib_LTLIBRARIES = libotp.la
+ libotp_la_LDFLAGS = -version-info 1:4:1
+ libotp_la_LIBADD = $(LIB_des) $(LIB_roken) $(LIB_NDBM)
+-@HAVE_DB3_FALSE@ndbm_wrap = 
++
+ @HAVE_DB3_TRUE@ndbm_wrap = ndbm_wrap.c ndbm_wrap.h
++@HAVE_DB3_FALSE@ndbm_wrap = 
++
+ libotp_la_SOURCES = \
+ 	otp.c \
+ 	otp_challenge.c \
+@@ -394,48 +340,74 @@
+ 	$(ndbm_wrap) \
+ 	$(ROKEN_SRCS)
+ 
++
+ @do_roken_rename_TRUE@ROKEN_SRCS = snprintf.c strcasecmp.c strncasecmp.c strlwr.c strlcpy.c strlcat.c
++subdir = lib/otp
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libotp_la_DEPENDENCIES =
++am__libotp_la_SOURCES_DIST = otp.c otp_challenge.c otp_db.c otp_md.c \
++	otp_parse.c otp_print.c otp_verify.c otp_locl.h otp_md.h \
++	roken_rename.h ndbm_wrap.c ndbm_wrap.h snprintf.c strcasecmp.c \
++	strncasecmp.c strlwr.c strlcpy.c strlcat.c
++@HAVE_DB3_TRUE@am__objects_1 = ndbm_wrap.lo
++@HAVE_DB3_FALSE@am__objects_1 =
++@do_roken_rename_TRUE@am__objects_2 = snprintf.lo strcasecmp.lo \
++@do_roken_rename_TRUE@	strncasecmp.lo strlwr.lo strlcpy.lo \
++@do_roken_rename_TRUE@	strlcat.lo
++am_libotp_la_OBJECTS = otp.lo otp_challenge.lo otp_db.lo otp_md.lo \
++	otp_parse.lo otp_print.lo otp_verify.lo $(am__objects_1) \
++	$(am__objects_2)
++libotp_la_OBJECTS = $(am_libotp_la_OBJECTS)
++check_PROGRAMS = otptest$(EXEEXT)
++noinst_PROGRAMS = otptest$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++otptest_SOURCES = otptest.c
++otptest_OBJECTS = otptest.$(OBJEXT)
++otptest_DEPENDENCIES = libotp.la
++otptest_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(am__libotp_la_SOURCES_DIST) otptest.c
++HEADERS = $(include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libotp_la_SOURCES) otptest.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/otp/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/otp/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/otp/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -443,8 +415,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -476,19 +448,19 @@
+ 	$(LINK) $(otptest_LDFLAGS) $(otptest_OBJECTS) $(otptest_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -499,24 +471,33 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -525,7 +506,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -540,6 +520,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -562,9 +543,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -576,7 +561,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -599,10 +584,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -641,8 +625,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -685,14 +667,14 @@
+ 	clean clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool clean-noinstPROGRAMS ctags distclean \
+ 	distclean-compile distclean-generic distclean-libtool \
+-	distclean-tags distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
++	distclean-tags distdir dvi dvi-am info info-am install \
++	install-am install-data install-data-am install-exec \
+ 	install-exec-am install-includeHEADERS install-info \
+ 	install-info-am install-libLTLIBRARIES install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
+ 	uninstall-includeHEADERS uninstall-info-am \
+ 	uninstall-libLTLIBRARIES
+ 
+diff -ruN heimdal-0.6.3-old/lib/roken/Makefile.in heimdal-0.6.3/lib/roken/Makefile.in
+--- heimdal-0.6.3-old/lib/roken/Makefile.in	2004-09-13 22:29:35.000000000 +1000
++++ heimdal-0.6.3/lib/roken/Makefile.in	2004-09-14 08:40:03.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) $(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c $(nodist_make_roken_SOURCES) parse_bytes-test.c $(parse_reply_test_SOURCES) $(snprintf_test_SOURCES) $(strpftime_test_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,153 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog chown.c \
+-	copyhostent.c daemon.c ecalloc.c emalloc.c erealloc.c err.c \
+-	errx.c estrdup.c fchown.c flock.c fnmatch.c freeaddrinfo.c \
+-	freehostent.c gai_strerror.c getaddrinfo.c getcap.c getcwd.c \
+-	getdtablesize.c getegid.c geteuid.c getgid.c gethostname.c \
+-	getifaddrs.c getipnodebyaddr.c getipnodebyname.c getnameinfo.c \
+-	getopt.c gettimeofday.c getuid.c getusershell.c glob.c \
+-	hstrerror.c inet_aton.c inet_ntop.c inet_pton.c initgroups.c \
+-	innetgr.c install-sh iruserok.c localtime_r.c lstat.c \
+-	memmove.c missing mkinstalldirs mkstemp.c putenv.c rcmd.c \
+-	readv.c recvmsg.c sendmsg.c setegid.c setenv.c seteuid.c \
+-	strcasecmp.c strdup.c strerror.c strftime.c strlcat.c \
+-	strlcpy.c strlwr.c strncasecmp.c strndup.c strnlen.c \
+-	strptime.c strsep.c strsep_copy.c strtok_r.c strupr.c swab.c \
+-	unsetenv.c verr.c verrx.c vsyslog.c vwarn.c vwarnx.c warn.c \
+-	warnx.c writev.c
+-noinst_PROGRAMS = make-roken$(EXEEXT) snprintf-test$(EXEEXT)
+-check_PROGRAMS = base64-test$(EXEEXT) getaddrinfo-test$(EXEEXT) \
+-	parse_bytes-test$(EXEEXT) parse_reply-test$(EXEEXT) \
+-	snprintf-test$(EXEEXT) strpftime-test$(EXEEXT)
+-subdir = lib/roken
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+-am__DEPENDENCIES_1 =
+-libroken_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1)
+-am_libroken_la_OBJECTS = base64.lo bswap.lo concat.lo environment.lo \
+-	eread.lo esetenv.lo ewrite.lo getaddrinfo_hostspec.lo \
+-	get_default_username.lo get_window_size.lo getarg.lo \
+-	getnameinfo_verified.lo getprogname.lo h_errno.lo \
+-	hostent_find_fqdn.lo issuid.lo k_getpwnam.lo k_getpwuid.lo \
+-	mini_inetd.lo net_read.lo net_write.lo parse_bytes.lo \
+-	parse_time.lo parse_units.lo resolve.lo roken_gethostby.lo \
+-	rtbl.lo setprogname.lo signal.lo simple_exec.lo snprintf.lo \
+-	socket.lo strcollect.lo timeval.lo tm2time.lo unvis.lo \
+-	verify.lo vis.lo warnerr.lo write_pid.lo
+-libroken_la_OBJECTS = $(am_libroken_la_OBJECTS)
+-libtest_la_LIBADD =
+-am_libtest_la_OBJECTS = libtest_la-strftime.lo libtest_la-strptime.lo \
+-	libtest_la-snprintf.lo
+-libtest_la_OBJECTS = $(am_libtest_la_OBJECTS)
+-PROGRAMS = $(noinst_PROGRAMS)
+-base64_test_SOURCES = base64-test.c
+-base64_test_OBJECTS = base64-test.$(OBJEXT)
+-base64_test_LDADD = $(LDADD)
+-base64_test_DEPENDENCIES = libroken.la $(am__DEPENDENCIES_1)
+-getaddrinfo_test_SOURCES = getaddrinfo-test.c
+-getaddrinfo_test_OBJECTS = getaddrinfo-test.$(OBJEXT)
+-getaddrinfo_test_LDADD = $(LDADD)
+-getaddrinfo_test_DEPENDENCIES = libroken.la $(am__DEPENDENCIES_1)
+-nodist_make_roken_OBJECTS = make-roken.$(OBJEXT)
+-make_roken_OBJECTS = $(nodist_make_roken_OBJECTS)
+-make_roken_DEPENDENCIES =
+-parse_bytes_test_SOURCES = parse_bytes-test.c
+-parse_bytes_test_OBJECTS = parse_bytes-test.$(OBJEXT)
+-parse_bytes_test_LDADD = $(LDADD)
+-parse_bytes_test_DEPENDENCIES = libroken.la $(am__DEPENDENCIES_1)
+-am_parse_reply_test_OBJECTS =  \
+-	parse_reply_test-parse_reply-test.$(OBJEXT) \
+-	parse_reply_test-resolve.$(OBJEXT)
+-parse_reply_test_OBJECTS = $(am_parse_reply_test_OBJECTS)
+-parse_reply_test_LDADD = $(LDADD)
+-parse_reply_test_DEPENDENCIES = libroken.la $(am__DEPENDENCIES_1)
+-am_snprintf_test_OBJECTS = snprintf_test-snprintf-test.$(OBJEXT)
+-snprintf_test_OBJECTS = $(am_snprintf_test_OBJECTS)
+-am__DEPENDENCIES_2 = libroken.la $(am__DEPENDENCIES_1)
+-snprintf_test_DEPENDENCIES = libtest.la $(am__DEPENDENCIES_2)
+-am_strpftime_test_OBJECTS = strpftime-test.$(OBJEXT)
+-strpftime_test_OBJECTS = $(am_strpftime_test_OBJECTS)
+-strpftime_test_DEPENDENCIES = libtest.la $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) \
+-	$(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c \
+-	$(nodist_make_roken_SOURCES) parse_bytes-test.c \
+-	$(parse_reply_test_SOURCES) $(snprintf_test_SOURCES) \
+-	$(strpftime_test_SOURCES)
+-DIST_SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) \
+-	$(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c \
+-	parse_bytes-test.c $(parse_reply_test_SOURCES) \
+-	$(snprintf_test_SOURCES) $(strpftime_test_SOURCES)
+-man3dir = $(mandir)/man3
+-MANS = $(man_MANS)
+-am__include_HEADERS_DIST = base64.h getarg.h parse_bytes.h \
+-	parse_time.h parse_units.h resolve.h roken-common.h rtbl.h \
+-	xdbm.h err.h fnmatch.h glob.h ifaddrs.h vis.h
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -216,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -226,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -249,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -267,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -275,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -323,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -403,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -411,43 +277,78 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .hin
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ ACLOCAL_AMFLAGS = -I ../../cf
++
+ CLEANFILES = roken.h make-roken.c $(XHEADERS)
++
+ lib_LTLIBRARIES = libroken.la
+ libroken_la_LDFLAGS = -version-info 16:3:0
++
++noinst_PROGRAMS = make-roken snprintf-test
++
+ nodist_make_roken_SOURCES = make-roken.c
++
++check_PROGRAMS = \
++		base64-test			\
++		getaddrinfo-test		\
++		parse_bytes-test		\
++		parse_reply-test		\
++		snprintf-test			\
++		strpftime-test
++
++
+ TESTS = $(check_PROGRAMS)
++
+ LDADD = libroken.la $(LIB_crypt)
+ make_roken_LDADD = 
++
+ noinst_LTLIBRARIES = libtest.la
+ libtest_la_SOURCES = strftime.c strptime.c snprintf.c
+ libtest_la_CFLAGS = -DTEST_SNPRINTF
++
+ parse_reply_test_SOURCES = parse_reply-test.c resolve.c
+ parse_reply_test_CFLAGS = -DTEST_RESOLVE
++
+ strpftime_test_SOURCES = strpftime-test.c
+ strpftime_test_LDADD = libtest.la $(LDADD)
+ snprintf_test_SOURCES = snprintf-test.c
+ snprintf_test_LDADD = libtest.la $(LDADD)
+ snprintf_test_CFLAGS = -DTEST_SNPRINTF
++
+ libroken_la_SOURCES = \
+ 	base64.c		\
+ 	bswap.c			\
+@@ -493,26 +394,37 @@
+ 	write_pid.c		\
+ 	xdbm.h
+ 
++
+ EXTRA_libroken_la_SOURCES = \
+ 	err.hin			\
+ 	glob.hin		\
+ 	ifaddrs.hin		\
+ 	vis.hin	
+ 
++
+ EXTRA_DIST = roken.awk roken.h.in
++
+ libroken_la_LIBADD = @LTLIBOBJS@ $(DBLIB)
++
+ BUILT_SOURCES = make-roken.c roken.h
+ @have_err_h_FALSE@err_h = err.h
++
+ @have_err_h_TRUE@err_h = 
+ @have_fnmatch_h_FALSE@fnmatch_h = fnmatch.h
++
+ @have_fnmatch_h_TRUE@fnmatch_h = 
+-@have_glob_h_FALSE@glob_h = glob.h
++
+ @have_glob_h_TRUE@glob_h = 
+-@have_ifaddrs_h_FALSE@ifaddrs_h = ifaddrs.h
++@have_glob_h_FALSE@glob_h = roken-glob.h
++
+ @have_ifaddrs_h_TRUE@ifaddrs_h = 
++@have_ifaddrs_h_FALSE@ifaddrs_h = ifaddrs.h
+ @have_vis_h_FALSE@vis_h = vis.h
++
+ @have_vis_h_TRUE@vis_h = 
++
+ XHEADERS = $(err_h) $(fnmatch_h) $(glob_h) $(ifaddrs_h) $(vis_h)
++
+ include_HEADERS = \
+ 	base64.h				\
+ 	getarg.h				\
+@@ -525,50 +437,130 @@
+ 	xdbm.h					\
+ 	$(XHEADERS) 
+ 
++
+ nodist_include_HEADERS = roken.h
++
+ man_MANS = getarg.3
++subdir = lib/roken
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
++
++libroken_la_DEPENDENCIES = @LTLIBOBJS@
++am_libroken_la_OBJECTS = base64.lo bswap.lo concat.lo environment.lo \
++	eread.lo esetenv.lo ewrite.lo getaddrinfo_hostspec.lo \
++	get_default_username.lo get_window_size.lo getarg.lo \
++	getnameinfo_verified.lo getprogname.lo h_errno.lo \
++	hostent_find_fqdn.lo issuid.lo k_getpwnam.lo k_getpwuid.lo \
++	mini_inetd.lo net_read.lo net_write.lo parse_bytes.lo \
++	parse_time.lo parse_units.lo resolve.lo roken_gethostby.lo \
++	rtbl.lo setprogname.lo signal.lo simple_exec.lo snprintf.lo \
++	socket.lo strcollect.lo timeval.lo tm2time.lo unvis.lo \
++	verify.lo vis.lo warnerr.lo write_pid.lo
++libroken_la_OBJECTS = $(am_libroken_la_OBJECTS)
++libtest_la_LDFLAGS =
++libtest_la_LIBADD =
++am_libtest_la_OBJECTS = libtest_la-strftime.lo libtest_la-strptime.lo \
++	libtest_la-snprintf.lo
++libtest_la_OBJECTS = $(am_libtest_la_OBJECTS)
++check_PROGRAMS = base64-test$(EXEEXT) getaddrinfo-test$(EXEEXT) \
++	parse_bytes-test$(EXEEXT) parse_reply-test$(EXEEXT) \
++	snprintf-test$(EXEEXT) strpftime-test$(EXEEXT)
++noinst_PROGRAMS = make-roken$(EXEEXT) snprintf-test$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++base64_test_SOURCES = base64-test.c
++base64_test_OBJECTS = base64-test.$(OBJEXT)
++base64_test_LDADD = $(LDADD)
++base64_test_DEPENDENCIES = libroken.la
++base64_test_LDFLAGS =
++getaddrinfo_test_SOURCES = getaddrinfo-test.c
++getaddrinfo_test_OBJECTS = getaddrinfo-test.$(OBJEXT)
++getaddrinfo_test_LDADD = $(LDADD)
++getaddrinfo_test_DEPENDENCIES = libroken.la
++getaddrinfo_test_LDFLAGS =
++nodist_make_roken_OBJECTS = make-roken.$(OBJEXT)
++make_roken_OBJECTS = $(nodist_make_roken_OBJECTS)
++make_roken_DEPENDENCIES =
++make_roken_LDFLAGS =
++parse_bytes_test_SOURCES = parse_bytes-test.c
++parse_bytes_test_OBJECTS = parse_bytes-test.$(OBJEXT)
++parse_bytes_test_LDADD = $(LDADD)
++parse_bytes_test_DEPENDENCIES = libroken.la
++parse_bytes_test_LDFLAGS =
++am_parse_reply_test_OBJECTS = \
++	parse_reply_test-parse_reply-test.$(OBJEXT) \
++	parse_reply_test-resolve.$(OBJEXT)
++parse_reply_test_OBJECTS = $(am_parse_reply_test_OBJECTS)
++parse_reply_test_LDADD = $(LDADD)
++parse_reply_test_DEPENDENCIES = libroken.la
++parse_reply_test_LDFLAGS =
++am_snprintf_test_OBJECTS = snprintf_test-snprintf-test.$(OBJEXT)
++snprintf_test_OBJECTS = $(am_snprintf_test_OBJECTS)
++snprintf_test_DEPENDENCIES = libtest.la libroken.la
++snprintf_test_LDFLAGS =
++am_strpftime_test_OBJECTS = strpftime-test.$(OBJEXT)
++strpftime_test_OBJECTS = $(am_strpftime_test_OBJECTS)
++strpftime_test_DEPENDENCIES = libtest.la libroken.la
++strpftime_test_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) \
++	$(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c \
++	parse_bytes-test.c $(parse_reply_test_SOURCES) \
++	$(snprintf_test_SOURCES) $(strpftime_test_SOURCES)
++MANS = $(man_MANS)
++HEADERS = $(include_HEADERS) $(nodist_include_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am \
++	acinclude.m4 chown.c copyhostent.c daemon.c ecalloc.c emalloc.c \
++	erealloc.c err.c errx.c estrdup.c fchown.c flock.c fnmatch.c \
++	freeaddrinfo.c freehostent.c gai_strerror.c getaddrinfo.c \
++	getcap.c getcwd.c getdtablesize.c getegid.c geteuid.c getgid.c \
++	gethostname.c getifaddrs.c getipnodebyaddr.c getipnodebyname.c \
++	getnameinfo.c getopt.c gettimeofday.c getuid.c getusershell.c \
++	glob.c hstrerror.c inet_aton.c inet_ntop.c inet_pton.c \
++	initgroups.c innetgr.c install-sh iruserok.c localtime_r.c \
++	lstat.c memmove.c missing mkinstalldirs mkstemp.c putenv.c \
++	rcmd.c readv.c recvmsg.c sendmsg.c setegid.c setenv.c seteuid.c \
++	strcasecmp.c strdup.c strerror.c strftime.c strlcat.c strlcpy.c \
++	strlwr.c strncasecmp.c strndup.c strnlen.c strptime.c strsep.c \
++	strsep_copy.c strtok_r.c strupr.c swab.c unsetenv.c verr.c \
++	verrx.c vsyslog.c vwarn.c vwarnx.c warn.c warnx.c writev.c
++SOURCES = $(libroken_la_SOURCES) $(EXTRA_libroken_la_SOURCES) $(libtest_la_SOURCES) base64-test.c getaddrinfo-test.c $(nodist_make_roken_SOURCES) parse_bytes-test.c $(parse_reply_test_SOURCES) $(snprintf_test_SOURCES) $(strpftime_test_SOURCES)
++
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .hin .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/roken/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/roken/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/roken/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -576,8 +568,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -638,19 +630,19 @@
+ 	$(LINK) $(strpftime_test_LDFLAGS) $(strpftime_test_OBJECTS) $(strpftime_test_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ libtest_la-strftime.o: strftime.c
+ 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtest_la_CFLAGS) $(CFLAGS) -c -o libtest_la-strftime.o `test -f 'strftime.c' || echo '$(srcdir)/'`strftime.c
+@@ -715,9 +707,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man3dir = $(mandir)/man3
+ install-man3: $(man3_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man3dir)" || $(mkdir_p) "$(DESTDIR)$(man3dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man3dir)
+ 	@list='$(man3_MANS) $(dist_man3_MANS) $(nodist_man3_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -736,8 +730,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
+ uninstall-man3:
+ 	@$(NORMAL_UNINSTALL)
+@@ -757,44 +751,54 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man3dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man3dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man3dir)/$$inst; \
+ 	done
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
++nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-nodist_includeHEADERS: $(nodist_include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(nodist_includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-nodist_includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(nodist_include_HEADERS)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -803,7 +807,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -818,6 +821,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -854,24 +858,24 @@
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xpass=`expr $$xpass + 1`; \
+-		failed=`expr $$failed + 1`; \
+-		echo "XPASS: $$tst"; \
++	        xpass=`expr $$xpass + 1`; \
++	        failed=`expr $$failed + 1`; \
++	        echo "XPASS: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		echo "PASS: $$tst"; \
++	        echo "PASS: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+ 	      *" $$tst "*) \
+-		xfail=`expr $$xfail + 1`; \
+-		echo "XFAIL: $$tst"; \
++	        xfail=`expr $$xfail + 1`; \
++	        echo "XFAIL: $$tst"; \
+ 	      ;; \
+ 	      *) \
+-		failed=`expr $$failed + 1`; \
+-		echo "FAIL: $$tst"; \
++	        failed=`expr $$failed + 1`; \
++	        echo "FAIL: $$tst"; \
+ 	      ;; \
+ 	      esac; \
+ 	    else \
+@@ -913,9 +917,13 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	else :; fi
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -927,7 +935,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -950,12 +958,10 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \
+-		all-local
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)
+ install: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-am
+ install-exec: install-exec-am
+@@ -998,8 +1004,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -1047,8 +1051,8 @@
+ 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
++	dvi-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am \
+ 	install-includeHEADERS install-info install-info-am \
+ 	install-libLTLIBRARIES install-man install-man3 \
+ 	install-nodist_includeHEADERS install-strip installcheck \
+@@ -1193,6 +1197,8 @@
+ $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS)
+ .hin.h:
+ 	cp $< $@
++roken-glob.h:
++	cp glob.hin roken-glob.h
+ 
+ roken.h: make-roken$(EXEEXT)
+ 	@./make-roken$(EXEEXT) > tmp.h ;\
+diff -ruN heimdal-0.6.3-old/lib/sl/Makefile.in heimdal-0.6.3/lib/sl/Makefile.in
+--- heimdal-0.6.3-old/lib/sl/Makefile.in	2004-09-13 22:29:37.000000000 +1000
++++ heimdal-0.6.3/lib/sl/Makefile.in	2004-09-14 08:40:03.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,10 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-
+-SOURCES = $(libsl_la_SOURCES) $(libss_la_SOURCES) $(mk_cmds_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -31,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -45,105 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(ssinclude_HEADERS) \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog lex.c parse.c \
+-	parse.h
+-bin_PROGRAMS = mk_cmds$(EXEEXT)
+-subdir = lib/sl
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ssincludedir)"
+-libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES)
+-libsl_la_DEPENDENCIES =
+-am__libsl_la_SOURCES_DIST = sl_locl.h sl.c strtok_r.c snprintf.c \
+-	strdup.c strupr.c getprogname.c
+-@do_roken_rename_TRUE@am__objects_1 = strtok_r.lo snprintf.lo \
+-@do_roken_rename_TRUE@	strdup.lo strupr.lo getprogname.lo
+-am_libsl_la_OBJECTS = sl.lo $(am__objects_1)
+-libsl_la_OBJECTS = $(am_libsl_la_OBJECTS)
+-libss_la_DEPENDENCIES =
+-am__libss_la_SOURCES_DIST = sl_locl.h sl.c strtok_r.c snprintf.c \
+-	strdup.c strupr.c getprogname.c ss.c ss.h
+-am__objects_2 = sl.lo $(am__objects_1)
+-am_libss_la_OBJECTS = $(am__objects_2) ss.lo
+-libss_la_OBJECTS = $(am_libss_la_OBJECTS)
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_mk_cmds_OBJECTS = make_cmds.$(OBJEXT) parse.$(OBJEXT) lex.$(OBJEXT)
+-mk_cmds_OBJECTS = $(am_mk_cmds_OBJECTS)
+-am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-mk_cmds_DEPENDENCIES = libsl.la $(am__DEPENDENCIES_2)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
+-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
+-LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) \
+-	$(AM_YFLAGS)
+-SOURCES = $(libsl_la_SOURCES) $(libss_la_SOURCES) $(mk_cmds_SOURCES)
+-DIST_SOURCES = $(am__libsl_la_SOURCES_DIST) \
+-	$(am__libss_la_SOURCES_DIST) $(mk_cmds_SOURCES)
+-includeHEADERS_INSTALL = $(INSTALL_HEADER)
+-ssincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+-HEADERS = $(include_HEADERS) $(ssinclude_HEADERS)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -168,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -178,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -201,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -219,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -227,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -275,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -355,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -363,85 +277,142 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(ROKEN_RENAME)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ @do_roken_rename_TRUE@ES = strtok_r.c snprintf.c strdup.c strupr.c getprogname.c
++
+ YFLAGS = -d
++
+ include_HEADERS = sl.h
++
+ lib_LTLIBRARIES = libsl.la libss.la
+ libsl_la_LDFLAGS = -version-info 1:2:1
+ libss_la_LDFLAGS = -version-info 1:4:1
++
+ libsl_la_LIBADD = @LIB_readline@
+ libss_la_LIBADD = @LIB_readline@ @LIB_com_err@
++
+ libsl_la_SOURCES = sl_locl.h sl.c $(ES)
+ libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
++
++
++# install these?
++bin_PROGRAMS = mk_cmds
++
+ mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
+ mk_cmds_LDADD = libsl.la $(LDADD)
++
+ ssincludedir = $(includedir)/ss
+ ssinclude_HEADERS = ss.h
++
+ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c strdup.c strupr.c getprogname.c
++
+ LDADD = \
+ 	$(LIB_roken)				\
+ 	$(LEXLIB)
+ 
++subdir = lib/sl
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(lib_LTLIBRARIES)
++
++libsl_la_DEPENDENCIES =
++am__libsl_la_SOURCES_DIST = sl_locl.h sl.c strtok_r.c snprintf.c \
++	strdup.c strupr.c getprogname.c
++@do_roken_rename_TRUE@am__objects_1 = strtok_r.lo snprintf.lo strdup.lo \
++@do_roken_rename_TRUE@	strupr.lo getprogname.lo
++am_libsl_la_OBJECTS = sl.lo $(am__objects_1)
++libsl_la_OBJECTS = $(am_libsl_la_OBJECTS)
++libss_la_DEPENDENCIES =
++am__libss_la_SOURCES_DIST = sl_locl.h sl.c strtok_r.c snprintf.c \
++	strdup.c strupr.c getprogname.c ss.c ss.h
++am__objects_2 = sl.lo $(am__objects_1)
++am_libss_la_OBJECTS = $(am__objects_2) ss.lo
++libss_la_OBJECTS = $(am_libss_la_OBJECTS)
++bin_PROGRAMS = mk_cmds$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_mk_cmds_OBJECTS = make_cmds.$(OBJEXT) parse.$(OBJEXT) lex.$(OBJEXT)
++mk_cmds_OBJECTS = $(am_mk_cmds_OBJECTS)
++mk_cmds_DEPENDENCIES = libsl.la
++mk_cmds_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
++LTLEXCOMPILE = $(LIBTOOL) --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS)
++YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS)
++LTYACCCOMPILE = $(LIBTOOL) --mode=compile $(YACC) $(YFLAGS) $(AM_YFLAGS)
++DIST_SOURCES = $(am__libsl_la_SOURCES_DIST) $(am__libss_la_SOURCES_DIST) \
++	$(mk_cmds_SOURCES)
++HEADERS = $(include_HEADERS) $(ssinclude_HEADERS)
++
++DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in \
++	$(ssinclude_HEADERS) $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am lex.c \
++	parse.c parse.h
++SOURCES = $(libsl_la_SOURCES) $(libss_la_SOURCES) $(mk_cmds_SOURCES)
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .l .lo .o .obj .y
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/sl/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/sl/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/sl/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++libLTLIBRARIES_INSTALL = $(INSTALL)
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -449,8 +420,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+ clean-libLTLIBRARIES:
+@@ -465,17 +436,18 @@
+ 	$(LINK) -rpath $(libdir) $(libsl_la_LDFLAGS) $(libsl_la_OBJECTS) $(libsl_la_LIBADD) $(LIBS)
+ libss.la: $(libss_la_OBJECTS) $(libss_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libss_la_LDFLAGS) $(libss_la_OBJECTS) $(libss_la_LIBADD) $(LIBS)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -483,8 +455,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+@@ -503,27 +475,27 @@
+ 	$(LINK) $(mk_cmds_LDFLAGS) $(mk_cmds_OBJECTS) $(mk_cmds_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .l.c:
+-	$(LEXCOMPILE) $<
++	$(LEXCOMPILE) `test -f $< || echo '$(srcdir)/'`$<
+ 	sed '/^#/ s|$(LEX_OUTPUT_ROOT)\.c|$@|' $(LEX_OUTPUT_ROOT).c >$@
+ 	rm -f $(LEX_OUTPUT_ROOT).c
+ 
+ .y.c:
+-	$(YACCCOMPILE) $<
++	$(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$<
+ 	if test -f y.tab.h; then \
+ 	  to=`echo "$*_H" | sed \
+                 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
+@@ -551,41 +523,51 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
+-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
++	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
++	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ 	done
+ 
+ uninstall-includeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@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"; \
++	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
++	  rm -f $(DESTDIR)$(includedir)/$$f; \
+ 	done
++ssincludeHEADERS_INSTALL = $(INSTALL_HEADER)
+ install-ssincludeHEADERS: $(ssinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(ssincludedir)" || $(mkdir_p) "$(DESTDIR)$(ssincludedir)"
++	$(mkinstalldirs) $(DESTDIR)$(ssincludedir)
+ 	@list='$(ssinclude_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(ssincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(ssincludedir)/$$f'"; \
+-	  $(ssincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(ssincludedir)/$$f"; \
++	  echo " $(ssincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ssincludedir)/$$f"; \
++	  $(ssincludeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(ssincludedir)/$$f; \
+ 	done
+ 
+ uninstall-ssincludeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(ssinclude_HEADERS)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f '$(DESTDIR)$(ssincludedir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(ssincludedir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(ssincludedir)/$$f"; \
++	  rm -f $(DESTDIR)$(ssincludedir)/$$f; \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -594,7 +576,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -609,6 +590,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -631,9 +613,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -645,7 +631,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -669,10 +655,9 @@
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
+ install-binPROGRAMS: install-libLTLIBRARIES
+ 
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ssincludedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(ssincludedir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -715,8 +700,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -760,17 +743,17 @@
+ 	clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+ 	clean-libtool ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-libLTLIBRARIES install-man \
+-	install-ssincludeHEADERS install-strip installcheck \
+-	installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-generic mostlyclean mostlyclean-compile \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags uninstall uninstall-am uninstall-binPROGRAMS \
+-	uninstall-includeHEADERS uninstall-info-am \
+-	uninstall-libLTLIBRARIES uninstall-ssincludeHEADERS
++	dvi-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-includeHEADERS install-info install-info-am \
++	install-libLTLIBRARIES install-man install-ssincludeHEADERS \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
++	pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-binPROGRAMS uninstall-includeHEADERS \
++	uninstall-info-am uninstall-libLTLIBRARIES \
++	uninstall-ssincludeHEADERS
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/lib/vers/Makefile.in heimdal-0.6.3/lib/vers/Makefile.in
+--- heimdal-0.6.3-old/lib/vers/Makefile.in	2004-09-13 22:29:38.000000000 +1000
++++ heimdal-0.6.3/lib/vers/Makefile.in	2004-09-14 08:40:04.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -20,9 +20,6 @@
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
+ 
+-
+-SOURCES = $(libvers_la_SOURCES) make-print-version.c
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -30,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ../..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -44,82 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common ChangeLog
+-noinst_PROGRAMS = make-print-version$(EXEEXT)
+-subdir = lib/vers
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
+-libvers_la_LIBADD =
+-am_libvers_la_OBJECTS = print_version.lo
+-libvers_la_OBJECTS = $(am_libvers_la_OBJECTS)
+-PROGRAMS = $(noinst_PROGRAMS)
+-make_print_version_SOURCES = make-print-version.c
+-make_print_version_OBJECTS = make-print-version.$(OBJEXT)
+-am__DEPENDENCIES_1 =
+-@KRB4_TRUE@@KRB5_TRUE@make_print_version_DEPENDENCIES =  \
+-@KRB4_TRUE@@KRB5_TRUE@	$(am__DEPENDENCIES_1) \
+-@KRB4_TRUE@@KRB5_TRUE@	$(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+-depcomp =
+-am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libvers_la_SOURCES) make-print-version.c
+-DIST_SOURCES = $(libvers_la_SOURCES) make-print-version.c
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -144,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -154,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -177,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -195,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -203,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -251,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -331,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -339,63 +277,97 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ CLEANFILES = print_version.h
++
+ noinst_LTLIBRARIES = libvers.la
++
+ build_HEADERZ = vers.h
++
++noinst_PROGRAMS = make-print-version
++
+ @KRB4_TRUE@@KRB5_TRUE@make_print_version_LDADD = $(LIB_krb4) $(LIB_des)
++
+ libvers_la_SOURCES = print_version.c
++subdir = lib/vers
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++
++libvers_la_LDFLAGS =
++libvers_la_LIBADD =
++am_libvers_la_OBJECTS = print_version.lo
++libvers_la_OBJECTS = $(am_libvers_la_OBJECTS)
++noinst_PROGRAMS = make-print-version$(EXEEXT)
++PROGRAMS = $(noinst_PROGRAMS)
++
++make_print_version_SOURCES = make-print-version.c
++make_print_version_OBJECTS = make-print-version.$(OBJEXT)
++@KRB4_FALSE@@KRB5_TRUE@make_print_version_DEPENDENCIES =
++@KRB4_FALSE@@KRB5_FALSE@make_print_version_DEPENDENCIES =
++@KRB4_TRUE@@KRB5_TRUE@make_print_version_DEPENDENCIES =
++@KRB4_TRUE@@KRB5_FALSE@make_print_version_DEPENDENCIES =
++make_print_version_LDFLAGS =
++
++DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp =
++am__depfiles_maybe =
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libvers_la_SOURCES) make-print-version.c
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am
++SOURCES = $(libvers_la_SOURCES) make-print-version.c
++
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c .lo .o .obj
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps lib/vers/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps lib/vers/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  lib/vers/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ 
+ clean-noinstLTLIBRARIES:
+ 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+@@ -419,19 +391,19 @@
+ 	$(LINK) $(make_print_version_LDFLAGS) $(make_print_version_OBJECTS) $(make_print_version_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.$(OBJEXT)
++	-rm -f *.$(OBJEXT) core *.core
+ 
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ .c.o:
+-	$(COMPILE) -c $<
++	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ .c.obj:
+-	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ 
+ .c.lo:
+-	$(LTCOMPILE) -c -o $@ $<
++	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -443,6 +415,14 @@
+ 	-rm -f libtool
+ uninstall-info-am:
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -451,7 +431,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -466,6 +445,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -488,9 +468,13 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ../..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/../.. $(distdir)/../../cf
++	$(mkinstalldirs) $(distdir)/../.. $(distdir)/../../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -502,7 +486,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -524,6 +508,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) all-local
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -564,8 +549,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -607,10 +590,10 @@
+ 	clean clean-generic clean-libtool clean-noinstLTLIBRARIES \
+ 	clean-noinstPROGRAMS ctags distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-exec install-exec-am \
+-	install-info install-info-am install-man install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	dvi-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ 	tags uninstall uninstall-am uninstall-info-am
+diff -ruN heimdal-0.6.3-old/ltmain.sh heimdal-0.6.3/ltmain.sh
+--- heimdal-0.6.3-old/ltmain.sh	2004-09-13 22:26:36.000000000 +1000
++++ heimdal-0.6.3/ltmain.sh	2004-09-14 08:39:38.000000000 +1000
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -24,6 +24,29 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION=1.5.6
++TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 215 $"
++
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +59,7 @@
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +68,9 @@
+   cat <<EOF
+ $*
+ EOF
+-  exit 0
++  exit $EXIT_SUCCESS
+ fi
+ 
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5.2
+-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -100,7 +113,7 @@
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+   $echo "$modename: not configured to build any kind of library" 1>&2
+   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # Global variables.
+@@ -119,10 +132,13 @@
+ # Shell function definitions:
+ # This seems to be the best place for them
+ 
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid () {
+   win32_libid_type="unknown"
+   win32_fileres=`file -L $1 2>/dev/null`
+   case $win32_fileres in
+@@ -131,7 +147,7 @@
+     ;;
+   *ar\ archive*) # could be an import, or static
+     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+       win32_nmres=`eval $NM -f posix -A $1 | \
+ 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+       if test "X$win32_nmres" = "Ximport" ; then
+@@ -141,7 +157,7 @@
+       fi
+     fi
+     ;;
+-  *DLL*) 
++  *DLL*)
+     win32_libid_type="x86 DLL"
+     ;;
+   *executable*) # but shell scripts are "executable" too...
+@@ -155,9 +171,76 @@
+   $echo $win32_libid_type
+ }
+ 
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag () {
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
++}
+ # End of Shell function definitions
+ #####################################
+ 
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -183,7 +266,7 @@
+       case $tagname in
+       *[!-_A-Za-z0-9,/]*)
+ 	$echo "$progname: invalid tag name: $tagname" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+ 	;;
+       esac
+ 
+@@ -193,10 +276,10 @@
+ 	# not specially marked.
+ 	;;
+       *)
+-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ 	  taglist="$taglist $tagname"
+ 	  # Evaluate the configuration.
+-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ 	else
+ 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ 	fi
+@@ -225,16 +308,16 @@
+     $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+     $echo "This is free software; see the source for copying conditions.  There is NO"
+     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+     # Now print the configurations for the tags.
+     for tagname in $taglist; do
+-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+     done
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   --debug)
+@@ -259,7 +342,7 @@
+     else
+       $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -290,7 +373,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -303,7 +386,7 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # If this variable is set in any of the actions, the command in it
+@@ -359,7 +442,7 @@
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+@@ -401,7 +484,7 @@
+ 	-o)
+ 	  if test -n "$libobj" ; then
+ 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg_mode=target
+ 	  continue
+@@ -426,7 +509,7 @@
+ 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ 	  lastarg=
+ 	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
++ 	  for arg in $args; do
+ 	    IFS="$save_ifs"
+ 
+ 	    # Double-quote args containing other shell metacharacters.
+@@ -476,11 +559,11 @@
+     case $arg_mode in
+     arg)
+       $echo "$modename: you must specify an argument for -Xcompile"
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     target)
+       $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *)
+       # Get the name of the library object.
+@@ -513,50 +596,11 @@
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base compile
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case "$base_compile " in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#        else
+-#          $echo "$modename: using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
+-    fi
++    func_infer_tag $base_compile
+ 
+     for arg in $later; do
+       case $arg in
+@@ -589,7 +633,7 @@
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Delete any leftover library objects.
+@@ -600,7 +644,7 @@
+     fi
+ 
+     $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+@@ -619,7 +663,7 @@
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
+       output_obj=
+       need_locks=no
+@@ -629,7 +673,7 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$0" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -647,7 +691,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+       $echo $srcfile > "$lockfile"
+     fi
+@@ -702,7 +746,7 @@
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -722,7 +766,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+@@ -774,7 +818,7 @@
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+@@ -794,7 +838,7 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+@@ -832,7 +876,7 @@
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -904,46 +948,7 @@
+     vinfo=
+     vinfo_number=no
+ 
+-    # Infer tagged configuration to use if any are available and
+-    # if one wasn't chosen via the "--tag" command line option.
+-    # Only attempt this if the compiler in the base link
+-    # command doesn't match the default compiler.
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      case $base_compile in
+-      # Blanks in the command may have been stripped by the calling shell,
+-      # but not from the CC environment variable when configure was run.
+-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+-	    case $base_compile in
+-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+-	      # The compiler in $compile_command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  $echo "$modename: unable to infer tagged configuration"
+-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+-	  exit 1
+-#       else
+-#         $echo "$modename: using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
+-    fi
++    func_infer_tag $base_compile
+ 
+     # We need to know -static, to get the right output filenames.
+     for arg
+@@ -1039,7 +1044,7 @@
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  prev=
+ 	  continue
+@@ -1091,7 +1096,7 @@
+ 		   test "$pic_object" = none && \
+ 		   test "$non_pic_object" = none; then
+ 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 
+ 		# Extract subdirectory from the argument.
+@@ -1144,7 +1149,7 @@
+ 		# Only an error if not doing a dry-run.
+ 		if test -z "$run"; then
+ 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		else
+ 		  # Dry-run case.
+ 
+@@ -1165,7 +1170,7 @@
+ 	    done
+ 	  else
+ 	    $echo "$modename: link input file \`$save_arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  arg=$save_arg
+ 	  prev=
+@@ -1177,7 +1182,7 @@
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+@@ -1217,6 +1222,11 @@
+ 	  finalize_command="$finalize_command $qarg"
+ 	  continue
+ 	  ;;
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	*)
+ 	  eval "$prev=\"\$arg\""
+ 	  prev=
+@@ -1265,7 +1275,7 @@
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+@@ -1301,7 +1311,7 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1452,7 +1462,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1575,7 +1585,7 @@
+ 	     test "$pic_object" = none && \
+ 	     test "$non_pic_object" = none; then
+ 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  # Extract subdirectory from the argument.
+@@ -1628,7 +1638,7 @@
+ 	  # Only an error if not doing a dry-run.
+ 	  if test -z "$run"; then
+ 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  else
+ 	    # Dry-run case.
+ 
+@@ -1695,7 +1705,7 @@
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1739,7 +1749,7 @@
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+@@ -1749,7 +1759,7 @@
+ 
+     case $host in
+     *cygwin* | *mingw* | *pw32*)
+-      # don't eliminate duplcations in $postdeps and $predeps
++      # don't eliminate duplications in $postdeps and $predeps
+       duplicate_compiler_generated_deps=yes
+       ;;
+     *)
+@@ -1802,7 +1812,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1828,7 +1838,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -1860,7 +1873,7 @@
+ 	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    for search_ext in .la $shrext .so .a; do
++	    for search_ext in .la $std_shrext .so .a; do
+ 	      # Search the libtool library
+ 	      lib="$searchdir/lib${name}${search_ext}"
+ 	      if test -f "$lib"; then
+@@ -1936,11 +1949,11 @@
+ 	    fi
+ 	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  *)
+ 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -2019,14 +2032,14 @@
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+ 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2062,7 +2075,7 @@
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+@@ -2079,12 +2092,12 @@
+ 	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
+-    
++
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+@@ -2092,16 +2105,18 @@
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+ 	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+ 	    # statically, we need to preload.  We also need to preload any
+ 	    # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2150,7 +2165,7 @@
+ 	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+@@ -2177,7 +2192,7 @@
+ 	  continue
+ 	fi
+ 
+-    
++
+ 	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+@@ -2264,17 +2279,18 @@
+ 	    need_relink=yes
+ 	  fi
+ 	  # This is a shared library
+-	
+-      # Warn about portability, can't link against -module's on some systems (darwin)
+-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ 	    $echo
+ 	    if test "$linkmode" = prog; then
+ 	      $echo "*** Warning: Linking the executable $output against the loadable module"
+ 	    else
+ 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+ 	    fi
+-	    $echo "*** $linklib is not portable!"    
+-      fi	  
++	    $echo "*** $linklib is not portable!"
++	  fi
+ 	  if test "$linkmode" = lib &&
+ 	     test "$hardcode_into_libs" = yes; then
+ 	    # Hardcode the library path.
+@@ -2372,9 +2388,9 @@
+ 		case $host in
+ 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ 		  *-*-darwin* )
+-		    # if the lib is a module then we can not link against it, someone
+-		    # is ignoring the new warnings I added
+-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ 		      $echo "** Warning, lib $linklib is a module, not a shared library"
+ 		      if test -z "$old_library" ; then
+ 		        $echo
+@@ -2382,7 +2398,7 @@
+ 		        $echo "** The link will probably fail, sorry"
+ 		      else
+ 		        add="$dir/$old_library"
+-		      fi 
++		      fi
+ 		    fi
+ 		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+@@ -2424,7 +2440,7 @@
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+@@ -2467,7 +2483,8 @@
+ 	      esac
+ 	      add="-l$name"
+ 	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ 	        add="$inst_prefix_dir$libdir/$linklib"
+ 	      else
+ 	        add="$libdir/$linklib"
+@@ -2547,7 +2564,8 @@
+ 
+ 	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+-	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
+ 	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+@@ -2604,7 +2622,7 @@
+ 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
++		    exit $EXIT_FAILURE
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+ 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+@@ -2614,7 +2632,8 @@
+ 		depdepl=
+ 		case $host in
+ 		*-*-darwin*)
+-		  # we do not want to link against static libs, but need to link against shared
++		  # we do not want to link against static libs,
++		  # but need to link against shared
+ 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ 		  if test -n "$deplibrary_names" ; then
+ 		    for tmp in $deplibrary_names ; do
+@@ -2622,7 +2641,7 @@
+ 		    done
+ 		    if test -f "$path/$depdepl" ; then
+ 		      depdepl="$path/$depdepl"
+-		   fi
++		    fi
+ 		    # do not add paths which are already there
+ 		    case " $newlib_search_path " in
+ 		    *" $path "*) ;;
+@@ -2632,33 +2651,32 @@
+ 		  path=""
+ 		  ;;
+ 		*)
+-		path="-L$path"
+-		;;
+-		esac 
+-		
++		  path="-L$path"
++		  ;;
++		esac
+ 		;;
+-		  -l*)
++	      -l*)
+ 		case $host in
+ 		*-*-darwin*)
+-		 # Again, we only want to link against shared libraries
+-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+-		 for tmp in $newlib_search_path ; do
+-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
+-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
+-		       break
+-		     fi  
+-         done
+-         path=""
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
+ 		  ;;
+ 		*) continue ;;
+-		esac  		  
++		esac
+ 		;;
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
+ 	      *" $depdepl "*) ;;
+-	      *) deplibs="$deplibs $depdepl" ;;
+-	      esac	      
++	      *) deplibs="$depdepl $deplibs" ;;
++	      esac
+ 	      case " $deplibs " in
+ 	      *" $path "*) ;;
+ 	      *) deplibs="$deplibs $path" ;;
+@@ -2748,7 +2766,8 @@
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
+       tmp_libs=
+       for i in $dependency_libs ; do
+ 	case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2808,19 +2827,19 @@
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+-	  eval shared_ext=\"$shrext\"
++	  eval shared_ext=\"$shrext_cmds\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2831,7 +2850,7 @@
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	else
+ 	  $echo
+ 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2879,13 +2898,13 @@
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# convert absolute version numbers to libtool ages
+ 	# this retains compatibility with .la files and attempts
+ 	# to make the code below a bit more comprehensible
+-	
++
+ 	case $vinfo_number in
+ 	yes)
+ 	  number_major="$2"
+@@ -2914,6 +2933,11 @@
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+@@ -2929,7 +2953,7 @@
+ 	*)
+ 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -2938,7 +2962,7 @@
+ 	*)
+ 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -2947,14 +2971,14 @@
+ 	*)
+ 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Calculate the version variables.
+@@ -3043,7 +3067,7 @@
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -3097,9 +3121,11 @@
+ 	    *.$objext)
+ 	       ;;
+ 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+-	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+-	       then
+-		 continue
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
+ 	       fi
+ 	       removelist="$removelist $p"
+ 	       ;;
+@@ -3580,7 +3606,7 @@
+ 	fi
+ 
+ 	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext\"
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+@@ -3644,12 +3670,12 @@
+ 	for test_deplib in $deplibs; do
+ 		case " $convenience " in
+ 		*" $test_deplib "*) ;;
+-		*) 
++		*)
+ 			tmp_deplibs="$tmp_deplibs $test_deplib"
+ 			;;
+ 		esac
+ 	done
+-	deplibs="$tmp_deplibs" 
++	deplibs="$tmp_deplibs"
+ 
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
+@@ -3832,7 +3858,6 @@
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $concat_cmds; do
+ 	    IFS="$save_ifs"
+-	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || exit $?
+ 	  done
+@@ -3879,7 +3904,7 @@
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
++	  exit $EXIT_SUCCESS
+ 	fi
+ 
+ 	# Create links to the real library.
+@@ -3927,7 +3952,7 @@
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -4038,7 +4063,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -4051,7 +4076,7 @@
+ 	# accidentally link it into a program.
+ 	# $show "echo timestamp > $libobj"
+ 	# $run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+@@ -4074,7 +4099,7 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+@@ -4392,7 +4417,7 @@
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -4480,7 +4505,7 @@
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+@@ -4535,10 +4560,10 @@
+       fi
+ 
+       # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+@@ -4564,7 +4589,7 @@
+ 	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+ 	    cwrapper=`$echo ${output}.exe`
+ 	    $rm $cwrappersource $cwrapper
+-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	    cat > $cwrappersource <<EOF
+ 
+@@ -4573,7 +4598,7 @@
+ 
+    The $output program cannot be directly executed until all the libtool
+    libraries that it depends on are installed.
+-   
++
+    This wrapper executable should never be moved out of the build directory.
+    If it is, it will not operate correctly.
+ 
+@@ -4605,7 +4630,7 @@
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+   defined (__OS2__)
+ #define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2 
++#ifndef DIR_SEPARATOR_2
+ #define DIR_SEPARATOR_2 '\\'
+ #endif
+ #endif
+@@ -4636,7 +4661,7 @@
+ {
+   char **newargz;
+   int i;
+-  
++
+   program_name = (char *) xstrdup ((char *) basename (argv[0]));
+   newargz = XMALLOC(char *, argc+2);
+ EOF
+@@ -4649,7 +4674,7 @@
+   newargz[1] = fnqualify(argv[0]);
+   /* we know the script has the same name, without the .exe */
+   /* so make sure newargz[1] doesn't end in .exe */
+-  strendzap(newargz[1],".exe"); 
++  strendzap(newargz[1],".exe");
+   for (i = 1; i < argc; i++)
+     newargz[i+1] = xstrdup(argv[i]);
+   newargz[argc+1] = NULL;
+@@ -4672,7 +4697,7 @@
+   return p;
+ }
+ 
+-char * 
++char *
+ xstrdup (const char *string)
+ {
+   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+@@ -4686,7 +4711,7 @@
+ 
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+   /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha (name[0]) && name[1] == ':') 
++  if (isalpha (name[0]) && name[1] == ':')
+     name += 2;
+ #endif
+ 
+@@ -4696,7 +4721,7 @@
+   return (char *) base;
+ }
+ 
+-char * 
++char *
+ fnqualify(const char *path)
+ {
+   size_t size;
+@@ -4724,7 +4749,7 @@
+ }
+ 
+ char *
+-strendzap(char *str, const char *pat) 
++strendzap(char *str, const char *pat)
+ {
+   size_t len, patlen;
+ 
+@@ -4744,7 +4769,7 @@
+ }
+ 
+ static void
+-lt_error_core (int exit_status, const char * mode, 
++lt_error_core (int exit_status, const char * mode,
+           const char * message, va_list ap)
+ {
+   fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4773,7 +4798,7 @@
+ 	  ;;
+ 	esac
+ 	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -4873,7 +4898,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -4935,20 +4960,20 @@
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+   else
+     # The program doesn't exist.
+     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+     esac
+ 
+@@ -5067,7 +5092,7 @@
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    last_oldobj=$obj
+-	  done  
++	  done
+ 	  for obj in $save_oldobjs
+ 	  do
+ 	    oldobjs="$objlist $obj"
+@@ -5081,7 +5106,7 @@
+ 	      oldobjs=$objlist
+ 	      if test "$obj" = "$last_oldobj" ; then
+ 	        RANLIB=$save_RANLIB
+-	      fi  
++	      fi
+ 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ 	      objlist=
+@@ -5130,11 +5155,13 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+       if test "$hardcode_automatic" = yes ; then
+-        relink_command=
+-      fi  
++	relink_command=
++      fi
++
++
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+ 	for installed in no yes; do
+@@ -5152,7 +5179,7 @@
+ 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+@@ -5166,7 +5193,7 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+@@ -5177,7 +5204,7 @@
+ 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+@@ -5185,7 +5212,7 @@
+ 	  else
+ 	    newdlfiles=
+ 	    for lib in $dlfiles; do
+-	      case $lib in 
++	      case $lib in
+ 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ 		*) abs=`pwd`"/$lib" ;;
+ 	      esac
+@@ -5194,7 +5221,7 @@
+ 	    dlfiles="$newdlfiles"
+ 	    newdlprefiles=
+ 	    for lib in $dlprefiles; do
+-	      case $lib in 
++	      case $lib in
+ 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ 		*) abs=`pwd`"/$lib" ;;
+ 	      esac
+@@ -5257,7 +5284,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -5346,13 +5373,13 @@
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -z "$files"; then
+@@ -5362,7 +5389,7 @@
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Strip any trailing slash from the destination.
+@@ -5383,7 +5410,7 @@
+       if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+     case $destdir in
+@@ -5395,7 +5422,7 @@
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       done
+@@ -5424,7 +5451,7 @@
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	library_names=
+@@ -5466,7 +5493,7 @@
+ 	  # but it's something to keep an eye on.
+ 	  if test "$inst_prefix_dir" = "$destdir"; then
+ 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  if test -n "$inst_prefix_dir"; then
+@@ -5481,7 +5508,7 @@
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	fi
+ 
+@@ -5560,7 +5587,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -5578,7 +5605,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -5632,7 +5659,7 @@
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  finalize=yes
+@@ -5673,8 +5700,12 @@
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ 	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      save_umask=`umask`
++	      umask 0077
++	      if $mkdir "$tmpdir"; then
++	        umask $save_umask
+ 	      else
++	        umask $save_umask
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ 		continue
+ 	      fi
+@@ -5757,9 +5788,9 @@
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+     else
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -5799,7 +5830,7 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    test "$show" = : && exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+     $echo "----------------------------------------------------------------------"
+     $echo "Libraries have been installed in:"
+@@ -5835,7 +5866,7 @@
+     $echo "See any operating system documentation about shared libraries for"
+     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+     $echo "----------------------------------------------------------------------"
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -5847,7 +5878,7 @@
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Handle -dlopen flags immediately.
+@@ -5855,7 +5886,7 @@
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       dir=
+@@ -5866,7 +5897,7 @@
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Read the libtool library.
+@@ -5893,7 +5924,7 @@
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	;;
+ 
+@@ -5973,7 +6004,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -6001,7 +6032,7 @@
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     rmdirs=
+@@ -6115,7 +6146,7 @@
+ 	if test "$mode" = clean ; then
+ 	  noexename=$name
+ 	  case $file in
+-	  *.exe) 
++	  *.exe)
+ 	    file=`$echo $file|${SED} 's,.exe$,,'`
+ 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+ 	    # $file with .exe has already been added to rmfiles,
+@@ -6160,20 +6191,20 @@
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # We need to display help for each of the modes.
+@@ -6209,7 +6240,7 @@
+ a more detailed description of MODE.
+ 
+ Report bugs to <bug-libtool@gnu.org>."
+-  exit 0
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -6364,14 +6395,14 @@
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+   ;;
+ esac
+ 
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+-exit 0
++exit $EXIT_SUCCESS
+ 
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries.  Given conflicting
+diff -ruN heimdal-0.6.3-old/Makefile.in heimdal-0.6.3/Makefile.in
+--- heimdal-0.6.3-old/Makefile.in	2004-09-13 22:28:49.000000000 +1000
++++ heimdal-0.6.3/Makefile.in	2004-09-14 08:39:40.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -19,6 +19,7 @@
+ # $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $
+ 
+ # $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -26,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,82 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure \
+-	ChangeLog NEWS TODO compile config.guess config.sub install-sh \
+-	ltconfig ltmain.sh missing mkinstalldirs
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+-	html-recursive info-recursive install-data-recursive \
+-	install-exec-recursive install-info-recursive \
+-	install-recursive installcheck-recursive installdirs-recursive \
+-	pdf-recursive ps-recursive uninstall-info-recursive \
+-	uninstall-recursive
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-am__remove_distdir = \
+-  { test ! -d $(distdir) \
+-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+-         && rm -fr $(distdir); }; }
+-DIST_ARCHIVES = $(distdir).tar.gz
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -140,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -150,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -173,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -191,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -199,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -247,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -327,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -335,64 +277,85 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ SUBDIRS = include lib kuser kdc admin kadmin kpasswd appl doc tools
++
+ ACLOCAL_AMFLAGS = -I cf
++
+ EXTRA_DIST = Makefile.am.common krb5.conf
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++	ps-recursive install-info-recursive uninstall-info-recursive \
++	all-recursive install-data-recursive install-exec-recursive \
++	installdirs-recursive install-recursive uninstall-recursive \
++	check-recursive installcheck-recursive
++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
++	$(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common ChangeLog Makefile.am NEWS \
++	TODO aclocal.m4 compile config.guess config.sub configure \
++	configure.in install-sh ltconfig ltmain.sh missing \
++	mkinstalldirs
++DIST_SUBDIRS = $(SUBDIRS)
+ all: all-recursive
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-am--refresh:
+-	@:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign  --ignore-deps'; \
+-	      cd $(srcdir) && $(AUTOMAKE) --foreign  --ignore-deps \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps Makefile'; \
++
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    echo ' $(SHELL) ./config.status'; \
+-	    $(SHELL) ./config.status;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+-	esac;
++	  $(AUTOMAKE) --foreign  Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ 
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ 	cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in cf/aix.m4 cf/auth-modules.m4 cf/broken-getaddrinfo.m4 cf/broken-getnameinfo.m4 cf/broken-glob.m4 cf/broken-realloc.m4 cf/broken-snprintf.m4 cf/broken.m4 cf/broken2.m4 cf/c-attribute.m4 cf/c-function.m4 cf/capabilities.m4 cf/check-compile-et.m4 cf/check-declaration.m4 cf/check-getpwnam_r-posix.m4 cf/check-man.m4 cf/check-netinet-ip-and-tcp.m4 cf/check-type-extra.m4 cf/check-var.m4 cf/check-x.m4 cf/check-xau.m4 cf/crypto.m4 cf/db.m4 cf/destdirs.m4 cf/dlopen.m4 cf/find-func-no-libs.m4 cf/find-func-no-libs2.m4 cf/find-func.m4 cf/find-if-not-broken.m4 cf/have-pragma-weak.m4 cf/have-struct-field.m4 cf/have-type.m4 cf/have-types.m4 cf/irix.m4 cf/krb-bigendian.m4 cf/krb-func-getcwd-broken.m4 cf/krb-func-getlogin.m4 cf/krb-ipv6.m4 cf/krb-prog-ln-s.m4 cf/krb-prog-ranlib.m4 cf/krb-prog-yacc.m4 cf/krb-readline.m4 cf/krb-struct-spwd.m4 cf/krb-struct-winsize.m4 cf/krb-sys-aix.m4 cf/krb-sys-nextstep.m4 cf/krb-version.m4 cf/mips-abi.m4 cf/misc.m4 cf/need-proto.m4 cf/osfc2.m4 cf/otp.m4 cf/proto-compat.m4 cf/retsigtype.m4 cf/roken-frag.m4 cf/roken.m4 cf/sunos.m4 cf/telnet.m4 cf/test-package.m4 cf/wflags.m4 cf/with-all.m4
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ mostlyclean-libtool:
+@@ -464,6 +427,14 @@
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ 	done
+ 
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+@@ -472,7 +443,6 @@
+ 	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+ 	mkid -fID $$unique
+-tags: TAGS
+ 
+ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -498,6 +468,7 @@
+ 	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ 	     $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+@@ -520,11 +491,24 @@
+ 
+ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = .
++distdir = $(PACKAGE)-$(VERSION)
++
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
+ 
+ distdir: $(DISTFILES)
+ 	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	$(mkdir_p) $(distdir)/cf
++	$(mkinstalldirs) $(distdir)/./cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -536,7 +520,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -553,13 +537,13 @@
+ 	done
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d "$(distdir)/$$subdir" \
+-	    || mkdir "$(distdir)/$$subdir" \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
+ 	    || exit 1; \
+ 	    (cd $$subdir && \
+ 	      $(MAKE) $(AM_MAKEFLAGS) \
+-	        top_distdir="../$(top_distdir)" \
+-	        distdir="../$(distdir)/$$subdir" \
++	        top_distdir="$(top_distdir)" \
++	        distdir=../$(distdir)/$$subdir \
+ 	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+@@ -576,23 +560,6 @@
+ 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+ 
+-dist-bzip2: distdir
+-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+-	$(am__remove_distdir)
+-
+-dist-tarZ: distdir
+-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+-	$(am__remove_distdir)
+-
+-dist-shar: distdir
+-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+-	$(am__remove_distdir)
+-
+-dist-zip: distdir
+-	-rm -f $(distdir).zip
+-	zip -rq $(distdir).zip $(distdir)
+-	$(am__remove_distdir)
+-
+ dist dist-all: distdir
+ 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ 	$(am__remove_distdir)
+@@ -601,18 +568,8 @@
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+-	case '$(DIST_ARCHIVES)' in \
+-	*.tar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+-	*.tar.bz2*) \
+-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+-	*.tar.Z*) \
+-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+-	*.shar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
+-	*.zip*) \
+-	  unzip $(distdir).zip ;;\
+-	esac
++	$(am__remove_distdir)
++	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ 	chmod -R a-w $(distdir); chmod a+w $(distdir)
+ 	mkdir $(distdir)/_build
+ 	mkdir $(distdir)/_inst
+@@ -632,20 +589,19 @@
+ 	        distuninstallcheck \
+ 	  && chmod -R a-w "$$dc_install_base" \
+ 	  && ({ \
+-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
++	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ 	  && rm -rf "$$dc_destdir" \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+-	  && rm -rf $(DIST_ARCHIVES) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
++	  && rm -f $(distdir).tar.gz \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ 	$(am__remove_distdir)
+-	@(echo "$(distdir) archives ready for distribution: "; \
+-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++	@echo "$(distdir).tar.gz is ready for distribution" | \
++	  sed 'h;s/./=/g;p;x;p;x'
+ distuninstallcheck:
+ 	@cd $(distuninstallcheck_dir) \
+ 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -670,6 +626,7 @@
+ all-am: Makefile all-local
+ installdirs: installdirs-recursive
+ installdirs-am:
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -708,8 +665,6 @@
+ 
+ dvi-am:
+ 
+-html: html-recursive
+-
+ info: info-recursive
+ 
+ info-am:
+@@ -750,20 +705,23 @@
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local \
+-	am--refresh check check-am check-local clean clean-generic \
+-	clean-libtool clean-recursive ctags ctags-recursive dist \
+-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \
++	check-am check-local clean clean-generic clean-libtool \
++	clean-recursive ctags ctags-recursive dist dist-all dist-gzip \
+ 	distcheck distclean distclean-generic distclean-libtool \
+ 	distclean-recursive distclean-tags distcleancheck distdir \
+-	distuninstallcheck dvi dvi-am html html-am info info-am \
+-	install install-am install-data install-data-am install-exec \
+-	install-exec-am install-info install-info-am install-man \
++	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
++	info-recursive install install-am install-data install-data-am \
++	install-data-recursive install-exec install-exec-am \
++	install-exec-recursive install-info install-info-am \
++	install-info-recursive install-man install-recursive \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	installdirs-am installdirs-recursive maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
++	tags-recursive uninstall uninstall-am uninstall-info-am \
++	uninstall-info-recursive uninstall-recursive
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.6.3-old/tools/Makefile.in heimdal-0.6.3/tools/Makefile.in
+--- heimdal-0.6.3-old/tools/Makefile.in	2004-09-13 22:29:38.000000000 +1000
++++ heimdal-0.6.3/tools/Makefile.in	2004-09-14 08:40:04.000000000 +1000
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004  Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# 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.
+@@ -27,6 +27,7 @@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -41,64 +42,6 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+-	$(top_srcdir)/Makefile.am.common \
+-	$(top_srcdir)/cf/Makefile.am.common
+-subdir = tools
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \
+-	$(top_srcdir)/cf/auth-modules.m4 \
+-	$(top_srcdir)/cf/broken-getaddrinfo.m4 \
+-	$(top_srcdir)/cf/broken-getnameinfo.m4 \
+-	$(top_srcdir)/cf/broken-glob.m4 \
+-	$(top_srcdir)/cf/broken-realloc.m4 \
+-	$(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \
+-	$(top_srcdir)/cf/broken2.m4 $(top_srcdir)/cf/c-attribute.m4 \
+-	$(top_srcdir)/cf/capabilities.m4 \
+-	$(top_srcdir)/cf/check-compile-et.m4 \
+-	$(top_srcdir)/cf/check-declaration.m4 \
+-	$(top_srcdir)/cf/check-getpwnam_r-posix.m4 \
+-	$(top_srcdir)/cf/check-man.m4 \
+-	$(top_srcdir)/cf/check-netinet-ip-and-tcp.m4 \
+-	$(top_srcdir)/cf/check-type-extra.m4 \
+-	$(top_srcdir)/cf/check-var.m4 $(top_srcdir)/cf/check-x.m4 \
+-	$(top_srcdir)/cf/check-xau.m4 $(top_srcdir)/cf/crypto.m4 \
+-	$(top_srcdir)/cf/db.m4 $(top_srcdir)/cf/destdirs.m4 \
+-	$(top_srcdir)/cf/dlopen.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs.m4 \
+-	$(top_srcdir)/cf/find-func-no-libs2.m4 \
+-	$(top_srcdir)/cf/find-func.m4 \
+-	$(top_srcdir)/cf/find-if-not-broken.m4 \
+-	$(top_srcdir)/cf/have-struct-field.m4 \
+-	$(top_srcdir)/cf/have-type.m4 $(top_srcdir)/cf/irix.m4 \
+-	$(top_srcdir)/cf/krb-bigendian.m4 \
+-	$(top_srcdir)/cf/krb-func-getlogin.m4 \
+-	$(top_srcdir)/cf/krb-ipv6.m4 $(top_srcdir)/cf/krb-prog-ln-s.m4 \
+-	$(top_srcdir)/cf/krb-readline.m4 \
+-	$(top_srcdir)/cf/krb-struct-spwd.m4 \
+-	$(top_srcdir)/cf/krb-struct-winsize.m4 \
+-	$(top_srcdir)/cf/mips-abi.m4 $(top_srcdir)/cf/misc.m4 \
+-	$(top_srcdir)/cf/need-proto.m4 $(top_srcdir)/cf/osfc2.m4 \
+-	$(top_srcdir)/cf/otp.m4 $(top_srcdir)/cf/proto-compat.m4 \
+-	$(top_srcdir)/cf/retsigtype.m4 $(top_srcdir)/cf/roken-frag.m4 \
+-	$(top_srcdir)/cf/sunos.m4 $(top_srcdir)/cf/telnet.m4 \
+-	$(top_srcdir)/cf/test-package.m4 $(top_srcdir)/cf/wflags.m4 \
+-	$(top_srcdir)/cf/with-all.m4 $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = $(top_builddir)/include/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+-SCRIPTS = $(bin_SCRIPTS)
+-depcomp =
+-am__depfiles_maybe =
+-SOURCES =
+-DIST_SOURCES =
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AIX4_FALSE = @AIX4_FALSE@
+ AIX4_TRUE = @AIX4_TRUE@
+@@ -123,6 +66,7 @@
+ COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
++CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXFLAGS = @CXXFLAGS@
+@@ -133,7 +77,14 @@
+ DEFS = @DEFS@
+ DIR_com_err = @DIR_com_err@
+ DIR_des = @DIR_des@
++DIR_hesiod = @DIR_hesiod@
++DIR_krb4 = @DIR_krb4@
++DIR_openldap = @DIR_openldap@
++DIR_otp = @DIR_otp@
++DIR_readline = @DIR_readline@
+ DIR_roken = @DIR_roken@
++DIR_sl = @DIR_sl@
++DIR_ss = @DIR_ss@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -156,12 +107,17 @@
+ HAVE_OPENSSL_TRUE = @HAVE_OPENSSL_TRUE@
+ HAVE_X_FALSE = @HAVE_X_FALSE@
+ HAVE_X_TRUE = @HAVE_X_TRUE@
+-INCLUDES_roken = @INCLUDES_roken@
+ INCLUDE_des = @INCLUDE_des@
+ INCLUDE_hesiod = @INCLUDE_hesiod@
++
+ INCLUDE_krb4 = @INCLUDE_krb4@
++
+ INCLUDE_openldap = @INCLUDE_openldap@
++INCLUDE_otp = @INCLUDE_otp@
++
+ INCLUDE_readline = @INCLUDE_readline@
++INCLUDE_sl = @INCLUDE_sl@
++INCLUDE_ss = @INCLUDE_ss@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -174,6 +130,7 @@
+ KRB5_TRUE = @KRB5_TRUE@
+ LDFLAGS = @LDFLAGS@
+ LEX = @LEX@
++
+ LEXLIB = @LEXLIB@
+ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+ LIBOBJS = @LIBOBJS@
+@@ -182,6 +139,7 @@
+ LIB_AUTH_SUBDIRS = @LIB_AUTH_SUBDIRS@
+ LIB_NDBM = @LIB_NDBM@
+ LIB_XauFileName = @LIB_XauFileName@
++
+ LIB_XauReadAuth = @LIB_XauReadAuth@
+ LIB_XauWriteAuth = @LIB_XauWriteAuth@
+ LIB_bswap16 = @LIB_bswap16@
+@@ -230,7 +188,9 @@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
+ LIB_setsockopt = @LIB_setsockopt@
++LIB_sl = @LIB_sl@
+ LIB_socket = @LIB_socket@
++LIB_ss = @LIB_ss@
+ LIB_syslog = @LIB_syslog@
+ LIB_tgetent = @LIB_tgetent@
+ LN_S = @LN_S@
+@@ -310,7 +270,6 @@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -318,71 +277,79 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++
+ SUFFIXES = .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
++
+ INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++
+ @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME
++
+ AM_CFLAGS = $(WFLAGS)
++
+ CP = cp
++
+ buildinclude = $(top_builddir)/include
+ LIB_getattr = @LIB_getattr@
+ LIB_getpwent_r = @LIB_getpwent_r@
+ LIB_odm_initialize = @LIB_odm_initialize@
+ LIB_setpcred = @LIB_setpcred@
++
+ HESIODLIB = @HESIODLIB@
+ HESIODINCLUDE = @HESIODINCLUDE@
++
++INCLUDE_roken = @INCLUDES_roken@
++INCLUDE_com_err = @INCLUDE_com_err@
++
+ NROFF_MAN = groff -mandoc -Tascii
++
+ LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
++
+ @KRB5_TRUE@LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
+ 
+ @KRB5_TRUE@LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
++
+ @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
++
+ EXTRA_DIST = krb5-config.1
++
+ CLEANFILES = krb5-config
++
+ bin_SCRIPTS = krb5-config
++
+ man_MANS = krb5-config.1
++subdir = tools
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++SCRIPTS = $(bin_SCRIPTS)
++
++depcomp =
++am__depfiles_maybe =
++DIST_SOURCES =
++MANS = $(man_MANS)
++DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/Makefile.am.common \
++	$(top_srcdir)/cf/Makefile.am.common Makefile.am
+ all: all-am
+ 
+ .SUFFIXES:
+ .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__configure_deps)
+-	@for dep in $?; do \
+-	  case '$(am__configure_deps)' in \
+-	    *$$dep*) \
+-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+-		&& exit 0; \
+-	      exit 1;; \
+-	  esac; \
+-	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  --ignore-deps tools/Makefile'; \
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  --ignore-deps tools/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+-	@case '$?' in \
+-	  *config.status*) \
+-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+-	  *) \
+-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+-	esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++	  $(AUTOMAKE) --foreign  tools/Makefile
++Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+ 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
++	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
++	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -390,8 +357,8 @@
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ mostlyclean-libtool:
+@@ -403,9 +370,11 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
++
++man1dir = $(mandir)/man1
+ install-man1: $(man1_MANS) $(man_MANS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+ 	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ 	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ 	for i in $$l2; do \
+@@ -424,8 +393,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -445,8 +414,8 @@
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -454,9 +423,13 @@
+ ctags: CTAGS
+ CTAGS:
+ 
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ 
+ distdir: $(DISTFILES)
+-	$(mkdir_p) $(distdir)/.. $(distdir)/../cf
++	$(mkinstalldirs) $(distdir)/.. $(distdir)/../cf
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ 	list='$(DISTFILES)'; for file in $$list; do \
+@@ -468,7 +441,7 @@
+ 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ 	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
++	    $(mkinstalldirs) "$(distdir)$$dir"; \
+ 	  else \
+ 	    dir=''; \
+ 	  fi; \
+@@ -490,10 +463,9 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) check-local
+ check: check-am
+ all-am: Makefile $(SCRIPTS) $(MANS) all-local
++
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+-	done
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -531,8 +503,6 @@
+ 
+ dvi-am:
+ 
+-html: html-am
+-
+ info: info-am
+ 
+ info-am:
+@@ -573,11 +543,11 @@
+ 
+ .PHONY: all all-am all-local check check-am check-local clean \
+ 	clean-generic clean-libtool distclean distclean-generic \
+-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+-	install install-am install-binSCRIPTS install-data \
+-	install-data-am install-exec install-exec-am install-info \
+-	install-info-am install-man install-man1 install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
++	distclean-libtool distdir dvi dvi-am info info-am install \
++	install-am install-binSCRIPTS install-data install-data-am \
++	install-exec install-exec-am install-info install-info-am \
++	install-man install-man1 install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ 	uninstall-binSCRIPTS uninstall-info-am uninstall-man \
--- heimdal-0.6.3.orig/debian/patches/022_ftp-roken-glob
+++ heimdal-0.6.3/debian/patches/022_ftp-roken-glob
@@ -0,0 +1,250 @@
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftp/cmds.c heimdal-0.6.3/appl/ftp/ftp/cmds.c
+--- heimdal-0.6.3-old/appl/ftp/ftp/cmds.c	2001-08-05 16:39:14.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftp/cmds.c	2004-09-13 15:48:26.000000000 +1000
+@@ -535,9 +535,17 @@
+ 
+ 	memset(&gl, 0, sizeof(gl));
+ 	flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
++#ifdef HAVE_GLOB
+ 	if (glob(argv[i], flags, NULL, &gl) || gl.gl_pathc == 0) {
++#else
++	if (roken_glob(argv[i], flags, NULL, &gl) || gl.gl_pathc == 0) {
++#endif 
+ 	    warnx("%s: not found", argv[i]);
++#ifdef HAVE_GLOB
+ 	    globfree(&gl);
++#else
++	    roken_globfree(&gl);
++#endif
+ 	    continue;
+ 	}
+ 	for (cpp = gl.gl_pathv; cpp && *cpp != NULL; cpp++) {
+@@ -558,7 +566,11 @@
+ 		}
+ 	    }
+ 	}
++#ifdef HAVE_GLOB
+ 	globfree(&gl);
++#else
++	roken_globfree(&gl);
++#endif
+     }
+     signal(SIGINT, oldintr);
+     mflag = 0;
+@@ -1567,14 +1579,27 @@
+ 
+ 	flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
+ 	memset(&gl, 0, sizeof(gl));
++#ifdef HAVE_GLOB
+ 	if (glob(*cpp, flags, NULL, &gl) ||
++#else 
++	if (roken_glob(*cpp, flags, NULL, &gl) ||
++#endif
+ 	    gl.gl_pathc == 0) {
+ 		warnx("%s: not found", *cpp);
++#ifdef HAVE_GLOB
+ 		globfree(&gl);
++#else
++		roken_globfree(&gl);
++#endif
+ 		return (0);
+ 	}
+ 	*cpp = strdup(gl.gl_pathv[0]);	/* XXX - wasted memory */
++#ifdef HAVE_GLOB
+ 	globfree(&gl);
++#else
++	roken_globfree(&gl);
++#endif
++
+ 	return (1);
+ }
+ 
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftp/ftp_locl.h heimdal-0.6.3/appl/ftp/ftp/ftp_locl.h
+--- heimdal-0.6.3-old/appl/ftp/ftp/ftp_locl.h	2002-09-11 06:03:46.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftp/ftp_locl.h	2004-09-13 15:48:26.000000000 +1000
+@@ -101,7 +101,11 @@
+ 
+ #include <errno.h>
+ #include <ctype.h>
++#ifdef HAVE_GLOB
+ #include <glob.h>
++#else
++#include <roken-glob.h>
++#endif 
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+ #endif
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftpd/ftpcmd.y heimdal-0.6.3/appl/ftp/ftpd/ftpcmd.y
+--- heimdal-0.6.3-old/appl/ftp/ftpd/ftpcmd.y	2004-08-21 01:15:46.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftpd/ftpcmd.y	2004-09-13 15:48:26.000000000 +1000
+@@ -826,14 +826,22 @@
+ 				 GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE;
+ 
+ 				memset(&gl, 0, sizeof(gl));
++#ifdef HAVE_GLOB
+ 				if (glob($1, flags, NULL, &gl) ||
++#else
++				if (roken_glob($1, flags, NULL, &gl) ||
++#endif
+ 				    gl.gl_pathc == 0) {
+ 					reply(550, "not found");
+ 					$$ = NULL;
+ 				} else {
+ 					$$ = strdup(gl.gl_pathv[0]);
+ 				}
++#ifdef HAVE_GLOB
+ 				globfree(&gl);
++#else
++				roken_globfree(&gl);
++#endif
+ 				free($1);
+ 			} else
+ 				$$ = $1;
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftpd/ftpd.c heimdal-0.6.3/appl/ftp/ftpd/ftpd.c
+--- heimdal-0.6.3-old/appl/ftp/ftpd/ftpd.c	2004-08-21 01:16:37.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftpd/ftpd.c	2004-09-13 15:51:10.000000000 +1000
+@@ -2234,7 +2234,11 @@
+ 
+ 	memset(&gl, 0, sizeof(gl));
+ 	freeglob = 1;
++#ifdef HAVE_GLOB
+ 	if (glob(whichf, flags, 0, &gl)) {
++#else
++	if (roken_glob(whichf, flags, 0, &gl)) {
++#endif
+ 	    reply(550, "not found");
+ 	    goto out;
+ 	} else if (gl.gl_pathc == 0) {
+@@ -2341,7 +2345,11 @@
+     pdata = -1;
+     if (freeglob) {
+ 	freeglob = 0;
++#ifdef HAVE_GLOB
+ 	globfree(&gl);
++#else
++	roken_globfree(&gl);
++#endif
+     }
+ }
+ 
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftpd/ftpd_locl.h heimdal-0.6.3/appl/ftp/ftpd/ftpd_locl.h
+--- heimdal-0.6.3-old/appl/ftp/ftpd/ftpd_locl.h	2004-08-21 01:17:07.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftpd/ftpd_locl.h	2004-09-13 15:48:26.000000000 +1000
+@@ -106,7 +106,11 @@
+ #ifdef HAVE_FCNTL_H
+ #include <fcntl.h>
+ #endif
++#ifdef HAVE_GLOB
+ #include <glob.h>
++#else
++#include <roken-glob.h>
++#endif 
+ #include <limits.h>
+ #ifdef HAVE_PWD_H
+ #include <pwd.h>
+diff -ruN heimdal-0.6.3-old/appl/ftp/ftpd/popen.c heimdal-0.6.3/appl/ftp/ftpd/popen.c
+--- heimdal-0.6.3-old/appl/ftp/ftpd/popen.c	2002-04-02 21:57:39.000000000 +1000
++++ heimdal-0.6.3/appl/ftp/ftpd/popen.c	2004-09-13 15:48:26.000000000 +1000
+@@ -55,7 +55,11 @@
+ #include <sys/wait.h>
+ 
+ #include <errno.h>
++#ifdef HAVE_GLOB
+ #include <glob.h>
++#else
++#include <roken-glob.h>
++#endif
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -149,7 +153,11 @@
+ 
+ 		memset(&gl, 0, sizeof(gl));
+ 		if (no_glob || 
++#ifdef HAVE_GLOB
+ 		    glob(argv[argc], flags, NULL, &gl) || 
++#else
++		    roken_glob(argv[argc], flags, NULL, &gl) ||
++#endif
+ 		    gl.gl_pathc == 0)
+ 			gargv[gargc++] = strdup(argv[argc]);
+ 		else
+@@ -157,7 +165,11 @@
+ 			     *pop && gargc < MAXGLOBS - 1;
+ 			     pop++)
+ 				gargv[gargc++] = strdup(*pop);
++#ifdef HAVE_GLOB
+ 		globfree(&gl);
++#else
++		roken_globfree(&gl);
++#endif
+ 	}
+ 	gargv[gargc] = NULL;
+ 
+diff -ruN heimdal-0.6.3-old/lib/roken/glob.c heimdal-0.6.3/lib/roken/glob.c
+--- heimdal-0.6.3-old/lib/roken/glob.c	2001-08-22 01:32:44.000000000 +1000
++++ heimdal-0.6.3/lib/roken/glob.c	2004-09-13 15:48:26.000000000 +1000
+@@ -171,7 +171,7 @@
+ #endif
+ 
+ int
+-glob(const char *pattern, 
++roken_glob(const char *pattern, 
+      int flags, 
+      int (*errfunc)(const char *, int), 
+      glob_t *pglob)
+@@ -746,7 +746,7 @@
+ 
+ /* Free allocated data belonging to a glob_t structure. */
+ void
+-globfree(glob_t *pglob)
++roken_globfree(glob_t *pglob)
+ {
+ 	int i;
+ 	char **pp;
+diff -ruN heimdal-0.6.3-old/lib/roken/glob.hin heimdal-0.6.3/lib/roken/glob.hin
+--- heimdal-0.6.3-old/lib/roken/glob.hin	2001-03-26 09:43:19.000000000 +1000
++++ heimdal-0.6.3/lib/roken/glob.hin	2004-09-13 15:48:26.000000000 +1000
+@@ -36,8 +36,8 @@
+  *	@(#)glob.h	8.1 (Berkeley) 6/2/93
+  */
+ 
+-#ifndef _GLOB_H_
+-#define	_GLOB_H_
++#ifndef _ROKEN_GLOB_H_
++#define	_ROKEN_GLOB_H_
+ 
+ struct stat;
+ typedef struct {
+@@ -79,7 +79,7 @@
+ #define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
+ #define	GLOB_ABEND	(-2)	/* Unignored error. */
+ 
+-int	glob (const char *, int, int (*)(const char *, int), glob_t *);
+-void	globfree (glob_t *);
++int	roken_glob (const char *, int, int (*)(const char *, int), glob_t *);
++void	roken_globfree (glob_t *);
+ 
+-#endif /* !_GLOB_H_ */
++#endif /* !_ROKEN_GLOB_H_ */
+diff -ruN heimdal-0.6.3-old/lib/roken/Makefile.am heimdal-0.6.3/lib/roken/Makefile.am
+--- heimdal-0.6.3-old/lib/roken/Makefile.am	2003-10-15 02:13:15.000000000 +1000
++++ heimdal-0.6.3/lib/roken/Makefile.am	2004-09-13 15:48:26.000000000 +1000
+@@ -113,7 +113,7 @@
+ if have_glob_h
+ glob_h =
+ else
+-glob_h = glob.h
++glob_h = roken-glob.h
+ endif
+ 
+ if have_ifaddrs_h
+@@ -150,6 +150,8 @@
+ SUFFIXES += .hin
+ .hin.h:
+ 	cp $< $@
++roken-glob.h:
++	cp glob.hin roken-glob.h
+ 
+ roken.h: make-roken$(EXEEXT)
+ 	@./make-roken$(EXEEXT) > tmp.h ;\
--- heimdal-0.6.3.orig/debian/patches/032_libtool_version_script
+++ heimdal-0.6.3/debian/patches/032_libtool_version_script
@@ -0,0 +1,311 @@
+diff -ruN heimdal-0.6.3-old/aclocal.m4 heimdal-0.6.3/aclocal.m4
+--- heimdal-0.6.3-old/aclocal.m4	2004-05-11 10:11:33.000000000 +1000
++++ heimdal-0.6.3/aclocal.m4	2004-05-11 10:15:47.000000000 +1000
+@@ -2508,6 +2508,9 @@
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
++  # argument to support GNU version scripts
++  version_script_arg='${wl}--version-script=\${libname}.ver'
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -3745,8 +3748,8 @@
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols $version_script_arg -o $lib'
+ 
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -4897,7 +4900,7 @@
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
++    old_postinstall_cmds old_postuninstall_cmds version_script_arg \
+     _LT_AC_TAGVAR(compiler, $1) \
+     _LT_AC_TAGVAR(CC, $1) \
+     _LT_AC_TAGVAR(LD, $1) \
+@@ -5098,6 +5101,9 @@
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
++# Linker argument to specify a version script (if supported)
++version_script_arg="$version_script_arg"
++
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+@@ -6214,7 +6220,7 @@
+ 
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
+ 	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+diff -ruN heimdal-0.6.3-old/configure heimdal-0.6.3/configure
+--- heimdal-0.6.3-old/configure	2004-05-11 10:11:34.000000000 +1000
++++ heimdal-0.6.3/configure	2004-05-11 10:18:06.000000000 +1000
+@@ -7559,7 +7559,7 @@
+ 
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
+ 	archive_cmds="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+@@ -8677,6 +8677,9 @@
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
++  # argument to support GNU version scripts
++  version_script_arg='${wl}--version-script=\${libname}.ver'
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -9815,7 +9818,7 @@
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
++    old_postinstall_cmds old_postuninstall_cmds version_script_arg \
+     compiler \
+     CC \
+     LD \
+@@ -10013,6 +10016,9 @@
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
++# Linker argument to specify a version script (if supported)
++version_script_arg="$version_script_arg"
++
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+@@ -10530,8 +10536,8 @@
+   # Check if GNU C++ uses GNU ld as the underlying linker, since the
+   # archiving commands below assume that GNU ld is being used.
+   if test "$with_gnu_ld" = yes; then
+-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols $version_script_arg -o $lib'
+ 
+     hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+     export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12369,6 +12375,9 @@
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
++  # argument to support GNU version scripts
++  version_script_arg='${wl}--version-script=\${libname}.ver'
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -13433,7 +13442,7 @@
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
++    old_postinstall_cmds old_postuninstall_cmds version_script_arg \
+     compiler_CXX \
+     CC_CXX \
+     LD_CXX \
+@@ -13583,6 +13592,9 @@
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
++# Linker argument to specify a version script (if supported)
++version_script_arg="$version_script_arg"
++
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+@@ -14412,7 +14424,7 @@
+ 
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
+ 	archive_cmds_F77="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+@@ -15510,6 +15522,9 @@
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
++  # argument to support GNU version scripts
++  version_script_arg='${wl}--version-script=\${libname}.ver'
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -15776,7 +15791,7 @@
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
++    old_postinstall_cmds old_postuninstall_cmds version_script_arg \
+     compiler_F77 \
+     CC_F77 \
+     LD_F77 \
+@@ -15926,6 +15941,9 @@
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
++# Linker argument to specify a version script (if supported)
++version_script_arg="$version_script_arg"
++
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+@@ -16738,7 +16756,7 @@
+ 
+   linux*)
+     if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname $version_script_arg -o $lib'
+ 	archive_cmds_GCJ="$tmp_archive_cmds"
+       supports_anon_versioning=no
+       case `$LD -v 2>/dev/null` in
+@@ -17856,6 +17874,9 @@
+     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
++  # argument to support GNU version scripts
++  version_script_arg='${wl}--version-script=\${libname}.ver'
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -18920,7 +18941,7 @@
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
++    old_postinstall_cmds old_postuninstall_cmds version_script_arg \
+     compiler_GCJ \
+     CC_GCJ \
+     LD_GCJ \
+@@ -19070,6 +19091,9 @@
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
++# Linker argument to specify a version script (if supported)
++version_script_arg="$version_script_arg"
++
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+@@ -19365,7 +19389,7 @@
+     lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
+     lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    old_postinstall_cmds old_postuninstall_cmds \
++    old_postinstall_cmds old_postuninstall_cmds version_script_arg \
+     compiler_RC \
+     CC_RC \
+     LD_RC \
+@@ -19515,6 +19539,9 @@
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+ 
++# Linker argument to specify a version script (if supported)
++version_script_arg="$version_script_arg"
++
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
+diff -ruN heimdal-0.6.3-old/lib/krb5/Makefile.am heimdal-0.6.3/lib/krb5/Makefile.am
+--- heimdal-0.6.3-old/lib/krb5/Makefile.am	2004-05-11 10:11:32.000000000 +1000
++++ heimdal-0.6.3/lib/krb5/Makefile.am	2004-05-11 10:11:39.000000000 +1000
+@@ -132,7 +132,7 @@
+ 	write_message.c				\
+ 	$(ERR_FILES)
+ 
+-libkrb5_la_LDFLAGS = -version-info 20:0:3
++libkrb5_la_LDFLAGS = -version-info 20:0:3 -symbol-version KRB5_17_HEIMDAL
+ 
+ $(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h $(srcdir)/krb5-private.h
+ 
+diff -ruN heimdal-0.6.3-old/lib/krb5/Makefile.in heimdal-0.6.3/lib/krb5/Makefile.in
+--- heimdal-0.6.3-old/lib/krb5/Makefile.in	2004-05-11 10:11:34.000000000 +1000
++++ heimdal-0.6.3/lib/krb5/Makefile.in	2004-05-11 10:11:39.000000000 +1000
+@@ -443,7 +443,7 @@
+ 	$(ERR_FILES)
+ 
+ 
+-libkrb5_la_LDFLAGS = -version-info 20:0:3
++libkrb5_la_LDFLAGS = -version-info 20:0:3 -symbol-version KRB5_17_HEIMDAL
+ 
+ 
+ #libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
+diff -ruN heimdal-0.6.3-old/ltmain.sh heimdal-0.6.3/ltmain.sh
+--- heimdal-0.6.3-old/ltmain.sh	2004-05-11 10:11:36.000000000 +1000
++++ heimdal-0.6.3/ltmain.sh	2004-05-11 10:11:39.000000000 +1000
+@@ -947,6 +947,7 @@
+     thread_safe=no
+     vinfo=
+     vinfo_number=no
++    symbolversion=
+ 
+     func_infer_tag $base_compile
+ 
+@@ -1496,6 +1497,11 @@
+ 	continue
+ 	;;
+ 
++      -symbol-version)
++	prev=symbolversion
++	continue
++	;;
++	
+       -Wc,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+ 	arg=
+@@ -3750,6 +3756,13 @@
+ 	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ 	fi
+ 
++	# Eval so we get the libname.
++	if test -n "$symbolversion"; then
++		eval version_script_arg=\"$version_script_arg\"
++	else
++		version_script_arg=
++	fi
++
+ 	# Do each of the archive commands.
+ 	if test "$module" = yes && test -n "$module_cmds" ; then
+ 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+@@ -3768,6 +3781,21 @@
+ 	  cmds=$archive_cmds
+ 	  fi
+ 	fi
++	if test -n "$symbolversion"; then
++	  cat > ${libname}.ver <<EOF
++HIDDEN {
++	local:
++		__*;
++		_rest*;
++		_save*;
++};
++
++$symbolversion {
++	global:
++		*;
++};
++EOF
++	fi
+ 
+ 	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+ 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
--- heimdal-0.6.3.orig/debian/patches/031_autotools
+++ heimdal-0.6.3/debian/patches/031_autotools
@@ -0,0 +1,9 @@
+--- heimdal-0.6.3/ltmain.sh.orig	Fri May 11 05:34:59 2001
++++ heimdal-0.6.3/ltmain.sh	Thu May 31 02:14:09 2001
+@@ -1862,6 +1862,7 @@
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+ 	      add_dir="-L$libdir"
++	      test -d $ladir/.libs && add_dir="$add_dir -L$ladir/.libs"
+ 	      add="-l$name"
+ 	    fi
--- heimdal-0.6.3.orig/debian/patches/022_openafs
+++ heimdal-0.6.3/debian/patches/022_openafs
@@ -0,0 +1,14 @@
+diff -ruN heimdal-0.6.3-old/lib/krb5/keytab_keyfile.c heimdal-0.6.3/lib/krb5/keytab_keyfile.c
+--- heimdal-0.6.3-old/lib/krb5/keytab_keyfile.c 2002-10-21 17:42:06.000000000 +0200
++++ heimdal-0.6.3/lib/krb5/keytab_keyfile.c     2004-12-18 20:16:30.000000000 +0100
+@@ -48,8 +48,8 @@
+  *
+  */
+ 
+-#define AFS_SERVERTHISCELL "/usr/afs/etc/ThisCell"
+-#define AFS_SERVERMAGICKRBCONF "/usr/afs/etc/krb.conf"
++#define AFS_SERVERTHISCELL "/etc/openafs/ThisCell"
++#define AFS_SERVERMAGICKRBCONF "/etc/openafs/etc/krb.conf"
+ 
+ struct akf_data {
+     int num_entries;
--- heimdal-0.6.3.orig/debian/patches/001_kdc_sigpipe
+++ heimdal-0.6.3/debian/patches/001_kdc_sigpipe
@@ -0,0 +1,88 @@
+
+Love <lha@stacken.kth.se> writes:
+
+> "Jeffrey Layton" <jtlayton@poochiereds.net> writes:
+>
+>> On 12/13/2004, "Love" <lha@stacken.kth.se> wrote:
+>>
+>>>
+>>>Here is a tested, and soon commited patch that fixes the problem.
+>>>
+>>>Love
+>>>
+>>>
+>>
+>> Been out of the loop for a couple of days and was going to give this
+>> patch a shot, but it doesn't apply cleanly for me. I'm using the
+>> debian 0.6.3-4 source package. Is this patch against a different version?
+>
+> Yes, its agaist the upcoming 0.7 release, I'll backport the change, I'll se
+> if I get the changes to do it tonight.
+
+Here is a diff to 0.6.3 release.
+
+Love
+
+diff -u -r1.27 -r1.27.4.1
+--- heimdal-0.6.3-old/kdc/main.c	28 Aug 2002 21:27:16 -0000	1.27
++++ heimdal-0.6.3/kdc/main.c	14 Dec 2004 21:43:37 -0000	1.27.4.1
+@@ -98,10 +98,14 @@
+ 
+ 	sigaction(SIGINT, &sa, NULL);
+ 	sigaction(SIGTERM, &sa, NULL);
++
++	sa.sa_handler = SIG_IGN;
++	sigaction(SIGPIPE, &sa, NULL);
+     }
+ #else
+     signal(SIGINT, sigterm);
+     signal(SIGTERM, sigterm);
++    signal(SIGPIPE, SIG_IGN);
+ #endif
+ #ifdef HAVE_DAEMON
+     if (detach_from_console)
+diff -u -r1.90.2.2 -r1.90.2.3
+--- heimdal-0.6.3-old/kdc/connect.c	2 Apr 2004 20:50:53 -0000	1.90.2.2
++++ heimdal-0.6.3/kdc/connect.c	14 Dec 2004 21:42:55 -0000	1.90.2.3
+@@ -660,11 +660,19 @@
+ 	    "<H1>404 Not found</H1>\r\n"
+ 	    "That page doesn't exist, maybe you are looking for "
+ 	    "<A HREF=\"http://www.pdc.kth.se/heimdal/\">Heimdal</A>?\r\n";
+-	write(d->s, proto, strlen(proto));
+-	write(d->s, msg, strlen(msg));
+ 	kdc_log(0, "HTTP request from %s is non KDC request", d->addr_string);
+ 	kdc_log(5, "Request: %s", t);
+ 	free(data);
++	if (write(d->s, proto, strlen(proto)) < 0) {
++	    kdc_log(0, "HTTP write failed: %s: %s", 
++		    d->addr_string, strerror(errno));
++	    return -1;
++	}
++	if (write(d->s, msg, strlen(msg)) < 0) {
++	    kdc_log(0, "HTTP write failed: %s: %s", 
++		    d->addr_string, strerror(errno));
++	    return -1;
++	}
+ 	return -1;
+     }
+     {
+@@ -675,8 +683,16 @@
+ 	    "Pragma: no-cache\r\n"
+ 	    "Content-type: application/octet-stream\r\n"
+ 	    "Content-transfer-encoding: binary\r\n\r\n";
+-	write(d->s, proto, strlen(proto));
+-	write(d->s, msg, strlen(msg));
++	if (write(d->s, proto, strlen(proto)) < 0) {
++	    kdc_log(0, "HTTP write failed: %s: %s", 
++		    d->addr_string, strerror(errno));
++	    return -1;
++	}
++	if (write(d->s, msg, strlen(msg)) < 0) {
++	    kdc_log(0, "HTTP write failed: %s: %s", 
++		    d->addr_string, strerror(errno));
++	    return -1;
++	}
+     }
+     memcpy(d->buf, data, len);
+     d->len = len;
+
--- heimdal-0.6.3.orig/debian/patches/023_gcc4_fix
+++ heimdal-0.6.3/debian/patches/023_gcc4_fix
@@ -0,0 +1,41 @@
+diff -urN tmp/lib/asn1/gen_glue.c heimdal-0.6.3/lib/asn1/gen_glue.c
+--- tmp/lib/asn1/gen_glue.c	2005-03-21 23:03:47.637549000 +0100
++++ heimdal-0.6.3/lib/asn1/gen_glue.c	2005-03-21 23:04:53.005929285 +0100
+@@ -101,11 +101,11 @@
+     Type *t = s->type;
+     Member *m;
+     int tag = -1;
+-
++/*
+     fprintf (headerfile,
+ 	     "extern struct units %s_units[];",
+ 	     s->gen_name);
+-
++*/
+     fprintf (codefile,
+ 	     "struct units %s_units[] = {\n",
+ 	     s->gen_name);
+diff -urN tmp/kdc/kerberos5.c heimdal-0.6.3/kdc/kerberos5.c
+--- tmp/kdc/kerberos5.c	2004-08-13 21:28:26.000000000 +0200
++++ heimdal-0.6.3/kdc/kerberos5.c	2005-03-22 00:12:33.680196105 +0100
+@@ -37,6 +37,8 @@
+ 
+ #define MAX_TIME ((time_t)((1U << 31) - 1))
+ 
++extern struct units KDCOptions_units[];
++
+ static void
+ fix_time(time_t **t)
+ {
+diff -urN tmp/lib/kadm5/dump_log.c heimdal-0.6.3/lib/kadm5/dump_log.c
+--- tmp/lib/kadm5/dump_log.c	2003-04-16 19:56:02.000000000 +0200
++++ heimdal-0.6.3/lib/kadm5/dump_log.c	2005-03-22 00:11:26.201221863 +0100
+@@ -36,6 +36,8 @@
+ 
+ RCSID("$Id: dump_log.c,v 1.13 2003/04/16 17:56:02 lha Exp $");
+ 
++extern struct units HDBFlags_units[];
++
+ static char *op_names[] = {
+     "get",
+     "delete",
--- heimdal-0.6.3.orig/debian/patches/002_telnet_bof
+++ heimdal-0.6.3/debian/patches/002_telnet_bof
@@ -0,0 +1,88 @@
+--- heimdal-0.6.3/appl/telnet/telnet/telnet.c.orig	2002-05-03 12:19:43.000000000 +0200
++++ heimdal-0.6.3/appl/telnet/telnet/telnet.c	2005-04-21 01:07:40.854403312 +0200
+@@ -1294,6 +1294,7 @@
+ 
+ 
+ unsigned char slc_reply[128];
++unsigned char const * const slc_reply_eom = &slc_reply[sizeof(slc_reply)];
+ unsigned char *slc_replyp;
+ 
+ void
+@@ -1309,6 +1310,14 @@
+ void
+ slc_add_reply(unsigned char func, unsigned char flags, cc_t value)
+ {
++	/* A sequence of up to 6 bytes my be written for this member of the SLC
++	 * suboption list by this function.  The end of negotiation command,
++	 * which is written by slc_end_reply(), will require 2 additional
++	 * bytes.  Do not proceed unless there is sufficient space for these
++	 * items.
++	 */
++	if (&slc_replyp[6+2] > slc_reply_eom)
++		return;
+ 	if ((*slc_replyp++ = func) == IAC)
+ 		*slc_replyp++ = IAC;
+ 	if ((*slc_replyp++ = flags) == IAC)
+@@ -1322,6 +1331,9 @@
+ {
+     int len;
+ 
++    /* The end of negotiation command requires 2 bytes. */
++    if (&slc_replyp[2] > slc_reply_eom)
++            return;
+     *slc_replyp++ = IAC;
+     *slc_replyp++ = SE;
+     len = slc_replyp - slc_reply;
+@@ -1415,8 +1427,8 @@
+ 	}
+ }
+ 
+-#define	OPT_REPLY_SIZE	256
+-unsigned char *opt_reply;
++#define	OPT_REPLY_SIZE	(2 * SUBBUFSIZE)
++unsigned char *opt_reply = NULL;
+ unsigned char *opt_replyp;
+ unsigned char *opt_replyend;
+ 
+@@ -1475,9 +1487,9 @@
+ 		return;
+ 	}
+ 	vp = env_getvalue(ep);
+-	if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
+-				strlen((char *)ep) + 6 > opt_replyend)
+-	{
++        if (opt_replyp + (vp ? 2 * strlen((char *)vp) : 0) +
++                                2 * strlen((char *)ep) + 6 > opt_replyend)
++        {
+ 		int len;
+ 		void *tmp;
+ 		opt_replyend += OPT_REPLY_SIZE;
+@@ -1503,6 +1515,8 @@
+ 		*opt_replyp++ = ENV_USERVAR;
+ 	for (;;) {
+ 		while ((c = *ep++)) {
++			if (opt_replyp + (2 + 2) > opt_replyend)
++				return;
+ 			switch(c&0xff) {
+ 			case IAC:
+ 				*opt_replyp++ = IAC;
+@@ -1517,6 +1531,8 @@
+ 			*opt_replyp++ = c;
+ 		}
+ 		if ((ep = vp)) {
++			if (opt_replyp + (1 + 2 + 2) > opt_replyend)
++				return;
+ #ifdef	OLD_ENVIRON
+ 			if (telopt_environ == TELOPT_OLD_ENVIRON)
+ 				*opt_replyp++ = old_env_value;
+@@ -1547,7 +1563,9 @@
+ {
+ 	int len;
+ 
+-	len = opt_replyp - opt_reply + 2;
++	if (opt_replyp + 2 > opt_replyend)
++		return;
++	len = opt_replyp + 2 - opt_reply;
+ 	if (emptyok || len > 6) {
+ 		*opt_replyp++ = IAC;
+ 		*opt_replyp++ = SE;
--- heimdal-0.6.3.orig/debian/patches-0.3c/014_xnlock_manpage
+++ heimdal-0.6.3/debian/patches-0.3c/014_xnlock_manpage
@@ -0,0 +1,266 @@
+diff -ruN heimdal-0.3c-old/appl/xnlock/Makefile.am heimdal-0.3c/appl/xnlock/Makefile.am
+--- heimdal-0.3c-old/appl/xnlock/Makefile.am	Tue Jul 18 02:38:16 2000
++++ heimdal-0.3c/appl/xnlock/Makefile.am	Tue Nov 28 09:50:46 2000
+@@ -16,7 +16,7 @@
+ 
+ endif
+ 
+-man1_MANS = xnlock.man
++man1_MANS = xnlock.1
+ 
+ EXTRA_DIST = $(man1_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \
+ 	nose.down nose.front nose.left.front nose.right.front
+diff -ruN heimdal-0.3c-old/appl/xnlock/xnlock.1 heimdal-0.3c/appl/xnlock/xnlock.1
+--- heimdal-0.3c-old/appl/xnlock/xnlock.1	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3c/appl/xnlock/xnlock.1	Mon Oct 23 21:18:01 1995
+@@ -0,0 +1,123 @@
++.\" xnlock -- Dan Heller 1985 <argv@sun.com>
++.TH XNLOCK 1L "19 April 1990"
++.SH NAME
++xnlock \- amusing lock screen program with message for passers-by
++.SH SYNOPSIS
++.B xnlock
++[
++\fIoptions\fP
++]
++[
++\fImessage\fP
++]
++.SH DESCRIPTION
++.I xnlock
++is a program that acts as a screen saver for workstations running X11.
++It also "locks" the screen such that the workstation can be left
++unattended without worry that someone else will walk up to it and
++mess everything up.  When \fIxnlock\fP is running, a little man with
++a big nose and a hat runs around spewing out messages to the screen.
++By default, the messages are "humorous", but that depends on your
++sense of humor.
++.LP
++If a key or mouse button is pressed, a prompt is printed requesting the
++user's password.  If a RETURN is not typed within 30 seconds,
++the little man resumes running around.
++.LP
++Text on the command line is used as the message.  For example:
++.br
++	% xnlock I\'m out to lunch for a couple of hours.
++.br
++Note the need to quote shell metacharacters.
++.LP
++In the absence of flags or text, \fIxnlock\fP displays random fortunes.
++.SH OPTIONS
++Command line options override all resource specifications.
++All arguments that are not associated with a command line option
++is taken to be message text that the little man will "say" every
++once in a while.  The resource \fBxnlock.text\fP may be set to
++a string.
++.TP
++.BI \-fn " fontname"
++The default font is the first 18 point font in the \fInew century schoolbook\fP
++family.  While larger fonts are recokmmended over smaller ones, any font
++in the server's font list will work.  The resource to use for this option
++is \fBxnlock.font\fP.
++.TP
++.BI \-filename "  filename"
++Take the message to be displayed from the file \fIfilename\fP.
++If \fIfilename\fP is not specified, \fI$HOME/.msgfile\fP is used.
++If the contents of the file are changed during runtime, the most recent text
++of the file is used (allowing the displayed message to be altered remotely).
++Carriage returns within the text are allowed, but tabs or other control
++characters are not translated and should not be used.
++The resource available for this option is \fBxnlock.file\fP.
++.TP
++.BI \-ar
++Accept root's password to unlock screen.  This option is true by
++default.  The reason for this is so that someone's screen may be
++unlocked by autorized users in case of emergency and the person
++running the program is still out to lunch.  The resource available
++for specifying this option is \fBxnlock.acceptRootPasswd\fP.
++.TP
++.BI \-noar
++Don't accept root's password.  This option is for paranoids who
++fear their peers might breakin using root's password and remove
++their files anyway.  Specifying this option on the command line
++overrides the \fBxnlock.acceptRootPasswd\fP if set to True.
++.TP
++.BI \-ip
++Ignore password prompt.
++The resource available for this option is \fBxnlock.ignorePasswd\fP.
++.TP
++.BI \-noip
++Don't ignore password prompt.  This is available in order to
++override the resource \fBignorePasswd\fP if set to True.
++.TP
++.BI -fg " color"
++Specifies the foreground color.  The resource available for this
++is \fBxnlock.foreground\fP.
++.TP
++.BI -bg " color"
++Specifies the background color.  The resource available for this
++is \fBxnlock.background\fP.
++.TP
++.BI \-rv
++Reverse the foreground and background colors.
++The resource for this is \fBxvnlock.reverseVideo\fP.
++.TP
++.BI \-norv
++Don't use reverse video.  This is available to override the reverseVideo
++resource if set to True.
++.TP
++.BI \-prog " program"
++Receive message text from the running program \fIprogram\fP. If there
++are arguments to \fIprogram\fP, encase them with the name of the program in
++quotes (e.g. xnlock -t "fortune -o").
++The resource for this is \fBxnlock.program\fP.
++.SH RESOURCES
++.br
++xnlock.font:               fontname
++.br
++xnlock.foreground:         color
++.br
++xnlock.background:         color
++.br
++xnlock.reverseVideo:       True/False
++.br
++xnlock.text:               Some random text string
++.br
++xnlock.program:            program [args]
++.br
++xnlock.ignorePasswd:       True/False
++.br
++xnlock.acceptRootPasswd:   True/False
++.SH FILES
++\fIxnlock\fP               executable file
++.br
++~/.msgfile                 default message file
++.SH AUTHOR
++Dan Heller <argv@sun.com>  Copyright (c) 1985, 1990.
++.br
++The original version of this program was written using pixrects on
++a Sun 2 running SunOS 1.1.
+diff -ruN heimdal-0.3c-old/appl/xnlock/xnlock.man heimdal-0.3c/appl/xnlock/xnlock.man
+--- heimdal-0.3c-old/appl/xnlock/xnlock.man	Mon Oct 23 21:18:01 1995
++++ heimdal-0.3c/appl/xnlock/xnlock.man	Thu Jan  1 10:00:00 1970
+@@ -1,123 +0,0 @@
+-.\" xnlock -- Dan Heller 1985 <argv@sun.com>
+-.TH XNLOCK 1L "19 April 1990"
+-.SH NAME
+-xnlock \- amusing lock screen program with message for passers-by
+-.SH SYNOPSIS
+-.B xnlock
+-[
+-\fIoptions\fP
+-]
+-[
+-\fImessage\fP
+-]
+-.SH DESCRIPTION
+-.I xnlock
+-is a program that acts as a screen saver for workstations running X11.
+-It also "locks" the screen such that the workstation can be left
+-unattended without worry that someone else will walk up to it and
+-mess everything up.  When \fIxnlock\fP is running, a little man with
+-a big nose and a hat runs around spewing out messages to the screen.
+-By default, the messages are "humorous", but that depends on your
+-sense of humor.
+-.LP
+-If a key or mouse button is pressed, a prompt is printed requesting the
+-user's password.  If a RETURN is not typed within 30 seconds,
+-the little man resumes running around.
+-.LP
+-Text on the command line is used as the message.  For example:
+-.br
+-	% xnlock I\'m out to lunch for a couple of hours.
+-.br
+-Note the need to quote shell metacharacters.
+-.LP
+-In the absence of flags or text, \fIxnlock\fP displays random fortunes.
+-.SH OPTIONS
+-Command line options override all resource specifications.
+-All arguments that are not associated with a command line option
+-is taken to be message text that the little man will "say" every
+-once in a while.  The resource \fBxnlock.text\fP may be set to
+-a string.
+-.TP
+-.BI \-fn " fontname"
+-The default font is the first 18 point font in the \fInew century schoolbook\fP
+-family.  While larger fonts are recokmmended over smaller ones, any font
+-in the server's font list will work.  The resource to use for this option
+-is \fBxnlock.font\fP.
+-.TP
+-.BI \-filename "  filename"
+-Take the message to be displayed from the file \fIfilename\fP.
+-If \fIfilename\fP is not specified, \fI$HOME/.msgfile\fP is used.
+-If the contents of the file are changed during runtime, the most recent text
+-of the file is used (allowing the displayed message to be altered remotely).
+-Carriage returns within the text are allowed, but tabs or other control
+-characters are not translated and should not be used.
+-The resource available for this option is \fBxnlock.file\fP.
+-.TP
+-.BI \-ar
+-Accept root's password to unlock screen.  This option is true by
+-default.  The reason for this is so that someone's screen may be
+-unlocked by autorized users in case of emergency and the person
+-running the program is still out to lunch.  The resource available
+-for specifying this option is \fBxnlock.acceptRootPasswd\fP.
+-.TP
+-.BI \-noar
+-Don't accept root's password.  This option is for paranoids who
+-fear their peers might breakin using root's password and remove
+-their files anyway.  Specifying this option on the command line
+-overrides the \fBxnlock.acceptRootPasswd\fP if set to True.
+-.TP
+-.BI \-ip
+-Ignore password prompt.
+-The resource available for this option is \fBxnlock.ignorePasswd\fP.
+-.TP
+-.BI \-noip
+-Don't ignore password prompt.  This is available in order to
+-override the resource \fBignorePasswd\fP if set to True.
+-.TP
+-.BI -fg " color"
+-Specifies the foreground color.  The resource available for this
+-is \fBxnlock.foreground\fP.
+-.TP
+-.BI -bg " color"
+-Specifies the background color.  The resource available for this
+-is \fBxnlock.background\fP.
+-.TP
+-.BI \-rv
+-Reverse the foreground and background colors.
+-The resource for this is \fBxvnlock.reverseVideo\fP.
+-.TP
+-.BI \-norv
+-Don't use reverse video.  This is available to override the reverseVideo
+-resource if set to True.
+-.TP
+-.BI \-prog " program"
+-Receive message text from the running program \fIprogram\fP. If there
+-are arguments to \fIprogram\fP, encase them with the name of the program in
+-quotes (e.g. xnlock -t "fortune -o").
+-The resource for this is \fBxnlock.program\fP.
+-.SH RESOURCES
+-.br
+-xnlock.font:               fontname
+-.br
+-xnlock.foreground:         color
+-.br
+-xnlock.background:         color
+-.br
+-xnlock.reverseVideo:       True/False
+-.br
+-xnlock.text:               Some random text string
+-.br
+-xnlock.program:            program [args]
+-.br
+-xnlock.ignorePasswd:       True/False
+-.br
+-xnlock.acceptRootPasswd:   True/False
+-.SH FILES
+-\fIxnlock\fP               executable file
+-.br
+-~/.msgfile                 default message file
+-.SH AUTHOR
+-Dan Heller <argv@sun.com>  Copyright (c) 1985, 1990.
+-.br
+-The original version of this program was written using pixrects on
+-a Sun 2 running SunOS 1.1.
--- heimdal-0.6.3.orig/debian/patches-0.3c/000_ftp-lineedit
+++ heimdal-0.6.3/debian/patches-0.3c/000_ftp-lineedit
@@ -0,0 +1,181 @@
+Index: heimdal-0.3c/appl/ftp/ftp/ftp_var.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/ftp_var.h,v
+retrieving revision 1.1.1.2
+retrieving revision 1.2
+diff -c -r1.1.1.2 -r1.2
+*** heimdal-0.3c/appl/ftp/ftp/ftp_var.h 2000/07/31 03:16:33 1.1.1.2
+--- heimdal-0.3c/appl/ftp/ftp/ftp_var.h	2000/10/04 23:06:57	1.2
+***************
+*** 52,57 ****
+--- 52,58 ----
+  extern int	connected;		/* connected to server */
+  extern int	fromatty;		/* input is from a terminal */
+  extern int	interactive;		/* interactively prompt on m* cmds */
++ extern int	lineedit;		/* use line-editing */
+  extern int	debug;			/* debugging level */
+  extern int	bell;			/* ring bell on cmd completion */
+  extern int	doglob;			/* glob local file names */
+Index: heimdal-0.3c/appl/ftp/ftp/globals.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/globals.c,v
+retrieving revision 1.1.1.2
+retrieving revision 1.2
+diff -c -r1.1.1.2 -r1.2
+*** heimdal-0.3c/appl/ftp/ftp/globals.c 2000/07/31 03:16:33 1.1.1.2
+--- heimdal-0.3c/appl/ftp/ftp/globals.c	2000/10/04 23:06:57	1.2
+***************
+*** 11,16 ****
+--- 11,17 ----
+  int	connected;		/* connected to server */
+  int	fromatty;		/* input is from a terminal */
+  int	interactive;		/* interactively prompt on m* cmds */
++ int	lineedit;		/* use line-editing */
+  int	debug;			/* debugging level */
+  int	bell;			/* ring bell on cmd completion */
+  int	doglob;			/* glob local file names */
+Index: heimdal-0.3c/appl/ftp/ftp/main.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/main.c,v
+retrieving revision 1.1.1.4
+retrieving revision 1.3
+diff -c -r1.1.1.4 -r1.3
+*** heimdal-0.3c/appl/ftp/ftp/main.c 2000/07/31 03:16:33 1.1.1.4
+--- appl/ftp/ftp/main.c	2000/10/04 23:06:57	1.3
+***************
+*** 36,42 ****
+   */
+  
+  #include "ftp_locl.h"
+! RCSID("$Id: main.c,v 1.28 2000/06/21 02:46:10 assar Exp $");
+  
+  int
+  main(int argc, char **argv)
+--- 36,42 ----
+   */
+  
+  #include "ftp_locl.h"
+! RCSID("$Id: main.c,v 1.29 2000/10/04 06:08:54 assar Exp $");
+  
+  int
+  main(int argc, char **argv)
+***************
+*** 54,63 ****
+  	doglob = 1;
+  	interactive = 1;
+  	autologin = 1;
+  	passivemode = 0; /* passive mode not active */
+          use_kerberos = 1;
+  
+! 	while ((ch = getopt(argc, argv, "dginptvK")) != -1) {
+  		switch (ch) {
+  		case 'd':
+  			options |= SO_DEBUG;
+--- 54,64 ----
+  	doglob = 1;
+  	interactive = 1;
+  	autologin = 1;
++ 	lineedit = 1;
+  	passivemode = 0; /* passive mode not active */
+          use_kerberos = 1;
+  
+! 	while ((ch = getopt(argc, argv, "dgilnptvK")) != -1) {
+  		switch (ch) {
+  		case 'd':
+  			options |= SO_DEBUG;
+***************
+*** 72,77 ****
+--- 73,81 ----
+  			interactive = 0;
+  			break;
+  
++ 		case 'l':
++ 			lineedit = 0;
++ 			break;
+  		case 'n':
+  			autologin = 0;
+  			break;
+***************
+*** 94,100 ****
+  
+  		default:
+  		    fprintf(stderr,
+!                             "usage: ftp [-dginptvK] [host [port]]\n");
+  		    exit(1);
+  		}
+  	}
+--- 98,104 ----
+  
+  		default:
+  		    fprintf(stderr,
+!                             "usage: ftp [-dgilnptvK] [host [port]]\n");
+  		    exit(1);
+  		}
+  	}
+***************
+*** 206,215 ****
+  }
+  */
+  
+- #ifndef HAVE_READLINE
+- 
+  static char *
+! readline(char *prompt)
+  {
+      char buf[BUFSIZ];
+      printf ("%s", prompt);
+--- 210,217 ----
+  }
+  */
+  
+  static char *
+! simple_readline(char *prompt)
+  {
+      char buf[BUFSIZ];
+      printf ("%s", prompt);
+***************
+*** 221,226 ****
+--- 223,236 ----
+      return strdup(buf);
+  }
+  
++ #ifndef HAVE_READLINE
++ 
++ static char *
++ readline(char *prompt)
++ {
++     return simple_readline (prompt);
++ }
++ 
+  static void
+  add_history(char *p)
+  {
+***************
+*** 249,258 ****
+      for (;;) {
+  	if (fromatty) {
+  	    char *p;
+  	    p = readline("ftp> ");
+! 	    if(p == NULL)
+  		quit(0, 0);
+  	    strlcpy(line, p, sizeof(line));
+  	    add_history(p);
+  	    free(p);
+  	} else{
+--- 259,274 ----
+      for (;;) {
+  	if (fromatty) {
+  	    char *p;
++ 	    if (lineedit)
+  	    p = readline("ftp> ");
+! 	    else
+! 		p = simple_readline("ftp> ");
+! 	    if(p == NULL) {
+! 		printf("\n");
+  		quit(0, 0);
++ 	    }
+  	    strlcpy(line, p, sizeof(line));
++ 	    if (lineedit)
+  	    add_history(p);
+  	    free(p);
+  	} else{
--- heimdal-0.6.3.orig/debian/patches-0.3c/010_ftp-bugfix
+++ heimdal-0.6.3/debian/patches-0.3c/010_ftp-bugfix
@@ -0,0 +1,25 @@
+Index: heimdal-0.3c/appl/ftp/ftp/security.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/security.c,v
+retrieving revision 1.1.1.7
+retrieving revision 1.3
+diff -c -r1.1.1.7 -r1.3
+*** heimdal-0.3c/appl/ftp/ftp/security.c 2000/02/16 02:38:56 1.1.1.7
+--- heimdal-0.3c/appl/ftp/ftp/security.c	2000/11/08 06:27:32	1.3
+***************
+*** 237,243 ****
+  	ret = sec_get_data(fd, &in_buffer, data_prot);
+  	if (ret < 0)
+  	    return -1;
+! 	if(ret == 0 || in_buffer.size == 0) {
+  	    if(rx)
+  		in_buffer.eof_flag = 1;
+  	    return rx;
+--- 237,243 ----
+  	ret = sec_get_data(fd, &in_buffer, data_prot);
+  	if (ret < 0)
+  	    return -1;
+! 	if(ret == 0 && in_buffer.size == 0) {
+  	    if(rx)
+  		in_buffer.eof_flag = 1;
+  	    return rx;
--- heimdal-0.6.3.orig/debian/patches-0.3c/011_sharedlibs
+++ heimdal-0.6.3/debian/patches-0.3c/011_sharedlibs
@@ -0,0 +1,514 @@
+diff -ruN heimdal-0.3c-old/admin/Makefile.am heimdal-0.3c/admin/Makefile.am
+--- heimdal-0.3c-old/admin/Makefile.am	Thu Jan  6 19:02:37 2000
++++ heimdal-0.3c/admin/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline)
++INCLUDES += $(INCLUDE_readline) $(INCLUDE_ss)
+ 
+ man_MANS = ktutil.8
+ 
+@@ -24,6 +24,6 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(top_builddir)/lib/des/libdes.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+diff -ruN heimdal-0.3c-old/admin/ktutil_locl.h heimdal-0.3c/admin/ktutil_locl.h
+--- heimdal-0.3c-old/admin/ktutil_locl.h	Wed Jul 19 23:58:19 2000
++++ heimdal-0.3c/admin/ktutil_locl.h	Fri Nov 17 15:10:51 2000
+@@ -60,7 +60,7 @@
+ #include <kadm5/admin.h>
+ #include <kadm5/kadm5_err.h>
+ 
+-#include <sl.h>
++#include <ss.h>
+ #include <getarg.h>
+ 
+ extern krb5_context context;
+diff -ruN heimdal-0.3c-old/cf/Makefile.am.common heimdal-0.3c/cf/Makefile.am.common
+--- heimdal-0.3c-old/cf/Makefile.am.common	Fri Aug  4 21:20:28 2000
++++ heimdal-0.3c/cf/Makefile.am.common	Fri Nov 17 15:10:51 2000
+@@ -10,7 +10,7 @@
+ 
+ CP	= cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ ## set build_HEADERZ to headers that should just be installed in build tree
+ 
+@@ -54,6 +54,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ LIB_readline = @LIB_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/cf/krb-com_err.m4 heimdal-0.3c/cf/krb-com_err.m4
+--- heimdal-0.3c-old/cf/krb-com_err.m4	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3c/cf/krb-com_err.m4	Fri Nov 17 15:56:33 2000
+@@ -0,0 +1,35 @@
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_COM_ERR,[
++dnl com_err
++
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++AC_DEFINE(HAVE_COM_ERR, 1, 
++	[Define if you have a com_err compatible library.])dnl
++
++])
++AC_SUBST(COMPILE_ET)
+diff -ruN heimdal-0.3c-old/cf/krb-readline.m4 heimdal-0.3c/cf/krb-readline.m4
+--- heimdal-0.3c-old/cf/krb-readline.m4	Mon Jun 12 22:52:57 2000
++++ heimdal-0.3c/cf/krb-readline.m4	Fri Nov 17 15:10:51 2000
+@@ -27,16 +27,18 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++ 	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $LIB_el_init"
+ else
+-	LIB_readline='$(top_builddir)/lib/editline/libeditline.a'
++ 	DIR_readline="editline"
++	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ AC_DEFINE(HAVE_READLINE, 1, 
+ 	[Define if you have a readline compatible library.])dnl
+ 
+-])
+\ No newline at end of file
++])
+diff -ruN heimdal-0.3c-old/cf/krb-ss.m4 heimdal-0.3c/cf/krb-ss.m4
+--- heimdal-0.3c-old/cf/krb-ss.m4	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3c/cf/krb-ss.m4	Fri Nov 17 19:18:13 2000
+@@ -0,0 +1,36 @@
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_SS,[
++dnl com_err
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++AC_DEFINE(HAVE_SS, 1, 
++	[Define if you have a ss compatible library.])dnl
++
++])
++AC_SUBST(LIB_sl)
+diff -ruN heimdal-0.3c-old/cf/test-package.m4 heimdal-0.3c/cf/test-package.m4
+--- heimdal-0.3c-old/cf/test-package.m4	Sun Jul 16 04:08:58 2000
++++ heimdal-0.3c/cf/test-package.m4	Fri Nov 17 15:10:51 2000
+@@ -2,7 +2,7 @@
+ dnl
+ dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+ 
+-AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
++AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
+ 
+ AC_DEFUN(AC_TEST_PACKAGE_NEW,[
+ AC_ARG_WITH($1,
+@@ -39,7 +39,7 @@
+ header_dirs=
+ lib_dirs=
+ d='$5'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -72,6 +72,7 @@
+ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+ 	$1_includedir="$ires"
+ 	$1_libdir="$lres"
++	DIR_$1=
+ 	INCLUDE_$1="-I$$1_includedir"
+ 	LIB_$1="-L$$1_libdir $3"
+ 	ifval([$6],
+@@ -80,6 +81,7 @@
+ 	with_$1=yes
+ 	AC_MSG_RESULT([headers $ires, libraries $lres])
+ else
++	DIR_$1="$1"
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	with_$1=no
+@@ -88,6 +90,7 @@
+ dnl ifval([$6],
+ dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
+ dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+diff -ruN heimdal-0.3c-old/configure.in heimdal-0.3c/configure.in
+--- heimdal-0.3c-old/configure.in	Wed Sep 20 20:55:26 2000
++++ heimdal-0.3c/configure.in	Fri Nov 17 15:10:51 2000
+@@ -226,6 +226,12 @@
+ [#include <stdio.h>
+  #include <readline.h>],-lreadline,,, READLINE)
+ 
++AC_TEST_PACKAGE_NEW(com_err,
++[#include <et/com_err.h>],-lcom_err,,, COM_ERR)
++
++AC_TEST_PACKAGE_NEW(ss,
++[#include <ss.h>],-lss,,, SS)
++
+ AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
+ 
+ KRB_C_BIGENDIAN
+@@ -553,6 +559,8 @@
+ AC_FIND_FUNC_NO_LIBS(des_cbc_encrypt, crypto des)
+ 
+ KRB_READLINE
++KRB_COM_ERR
++KRB_SS
+ 
+ dnl telnet muck --------------------------------------------------
+ 
+diff -ruN heimdal-0.3c-old/include/ss/Makefile.am heimdal-0.3c/include/ss/Makefile.am
+--- heimdal-0.3c-old/include/ss/Makefile.am	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3c/include/ss/Makefile.am	Fri Nov 17 16:32:42 2000
+@@ -0,0 +1,5 @@
++# $Id: Makefile.am,v 1.6 1999/03/20 13:58:17 joda Exp $
++
++include $(top_srcdir)/Makefile.am.common
++
++CLEANFILES = ss.h sl.h
+diff -ruN heimdal-0.3c-old/kadmin/Makefile.am heimdal-0.3c/kadmin/Makefile.am
+--- heimdal-0.3c-old/kadmin/Makefile.am	Mon Sep 11 06:14:45 2000
++++ heimdal-0.3c/kadmin/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
++INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_ss) -I$(srcdir)/../lib/krb5
+ 
+ sbin_PROGRAMS = kadmin
+ 
+@@ -62,7 +62,7 @@
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(COMMON_LDADD) \
+ 	$(LIB_dlopen)
+diff -ruN heimdal-0.3c-old/kadmin/kadmin.c heimdal-0.3c/kadmin/kadmin.c
+--- heimdal-0.3c-old/kadmin/kadmin.c	Mon Sep 11 06:20:49 2000
++++ heimdal-0.3c/kadmin/kadmin.c	Fri Nov 17 15:10:51 2000
+@@ -32,7 +32,7 @@
+  */
+ 
+ #include "kadmin_locl.h"
+-#include <sl.h>
++#include <ss.h>
+ 
+ RCSID("$Id: kadmin.c,v 1.32 2000/09/10 19:20:49 joda Exp $");
+ 
+diff -ruN heimdal-0.3c-old/lib/Makefile.am heimdal-0.3c/lib/Makefile.am
+--- heimdal-0.3c-old/lib/Makefile.am	Sun Jul 16 01:19:04 2000
++++ heimdal-0.3c/lib/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -12,5 +12,5 @@
+ dir_dce = kdfs
+ endif
+ 
+-SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 des krb5 \
++SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ asn1 des krb5 \
+ 	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+diff -ruN heimdal-0.3c-old/lib/asn1/Makefile.am heimdal-0.3c/lib/asn1/Makefile.am
+--- heimdal-0.3c-old/lib/asn1/Makefile.am	Tue Jul 25 20:35:19 2000
++++ heimdal-0.3c/lib/asn1/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -2,6 +2,8 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
++INCLUDES += $(INCLUDE_com_err)
++
+ YFLAGS = -d
+ 
+ lib_LTLIBRARIES = libasn1.la
+@@ -82,11 +84,11 @@
+ 	$(BUILT_SOURCES)
+ 
+ asn1_compile_LDADD = \
+-	$(LIB_roken) $(LEXLIB)
++        $(LIB_roken) $(LEXLIB)
+ 
+ check_der_LDADD = \
+ 	libasn1.la \
+-	../com_err/libcom_err.la \
++	$(LIB_com_err) \
+ 	$(LIB_roken)
+ 
+ asn1_print_LDADD = $(check_der_LDADD)
+diff -ruN heimdal-0.3c-old/lib/asn1/libasn1.h heimdal-0.3c/lib/asn1/libasn1.h
+--- heimdal-0.3c-old/lib/asn1/libasn1.h	Fri Dec  3 04:05:02 1999
++++ heimdal-0.3c/lib/asn1/libasn1.h	Fri Nov 17 15:10:51 2000
+@@ -47,4 +47,17 @@
+ #include "asn1_err.h"
+ #include <parse_units.h>
+ 
++#ifdef HACKED_AND_STUPID
++#define ASN1_BAD_TIMEFORMAT BAD_TIMEFORMAT
++#define ASN1_MISSING_FIELD MISSING_FIELD
++#define ASN1_MISPLACED_FIELD MISPLACED_FIELD
++#define ASN1_TYPE_MISMATCH TYPE_MISMATCH
++#define ASN1_OVERFLOW OVERFLOW
++#define ASN1_OVERRUN OVERRUN
++#define ASN1_BAD_ID BAD_ID
++#define ASN1_BAD_LENGTH BAD_LENGTH
++#define ASN1_BAD_FORMAT BAD_FORMAT
++#define ASN1_PARSE_ERROR PARSE_ERROR
++#endif
++
+ #endif /* __LIBASN1_H__ */
+diff -ruN heimdal-0.3c-old/lib/auth/sia/Makefile.am heimdal-0.3c/lib/auth/sia/Makefile.am
+--- heimdal-0.3c-old/lib/auth/sia/Makefile.am	Mon Jul 31 06:40:24 2000
++++ heimdal-0.3c/lib/auth/sia/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -23,7 +23,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.a		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
++	@LIB_sl@
+ 	$(top_builddir)/lib/roken/.libs/libroken.a	\
+ 	$(LIB_getpwnam_r)				\
+ 	-lc
+@@ -34,7 +34,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.so		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
++	@LIB_sl@
+ 	$(top_builddir)/lib/roken/.libs/libroken.so	\
+ 	$(LIB_getpwnam_r)				\
+ 	-lc
+diff -ruN heimdal-0.3c-old/lib/editline/Makefile.am heimdal-0.3c/lib/editline/Makefile.am
+--- heimdal-0.3c-old/lib/editline/Makefile.am	Thu Aug  5 03:30:12 1999
++++ heimdal-0.3c/lib/editline/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -4,7 +4,8 @@
+ 
+ man_MANS = editline.3
+ 
+-lib_LIBRARIES = libeditline.a
++lib_LTLIBRARIES = libeditline.la
++libeditline_la_LDFLAGS = -static
+ if el_compat
+ noinst_LIBRARIES = libel_compat.a
+ else
+@@ -16,13 +17,13 @@
+ CHECK_LOCAL =
+ 
+ testit_LDADD = \
+-	libeditline.a \
++	libeditline.la \
+ 	$(LIB_tgetent) \
+ 	$(LIB_roken)
+ 
+ include_HEADERS = editline.h
+ 
+-libeditline_a_SOURCES = complete.c editline.c sysunix.c \
++libeditline_la_SOURCES = complete.c editline.c sysunix.c \
+ 	editline.h roken_rename.h unix.h
+ libel_compat_a_SOURCES = edit_compat.c
+ 
+diff -ruN heimdal-0.3c-old/lib/krb5/Makefile.am heimdal-0.3c/lib/krb5/Makefile.am
+--- heimdal-0.3c-old/lib/krb5/Makefile.am	Wed Sep 20 00:09:26 2000
++++ heimdal-0.3c/lib/krb5/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_krb4)
++INCLUDES += $(INCLUDE_com_err) $(INCLUDE_krb4)
+ 
+ bin_PROGRAMS = verify_krb5_conf
+ 
+@@ -132,7 +132,7 @@
+ $(srcdir)/krb5-private.h:
+ 	cd $(srcdir); perl ../../cf/make-proto.pl -p krb5-private.h $(libkrb5_la_SOURCES) || rm -f krb5-private.h
+ 
+-libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
++libkrb5_la_LIBADD = $(LIB_com_err)
+ 
+ man_MANS =					\
+ 	krb5.conf.5				\
+diff -ruN heimdal-0.3c-old/lib/roken/Makefile.am heimdal-0.3c/lib/roken/Makefile.am
+--- heimdal-0.3c-old/lib/roken/Makefile.am	Wed Aug 16 21:22:59 2000
++++ heimdal-0.3c/lib/roken/Makefile.am	Fri Nov 17 15:10:51 2000
+@@ -155,7 +155,7 @@
+ 	parse_bytes.h parse_time.h parse_units.h	\
+ 	resolve.h roken-common.h		\
+ 	$(err_h) $(fnmatch_h) $(glob_h) rtbl.h xdbm.h
+-nodist_include_HEADERS = roken.h
++#!#nodist_include_HEADERS = roken.h
+ 
+ if have_err_h
+ err_h =
+diff -ruN heimdal-0.3c-old/lib/sl/Makefile.am heimdal-0.3c/lib/sl/Makefile.am
+--- heimdal-0.3c-old/lib/sl/Makefile.am	Sun Aug 20 01:00:39 2000
++++ heimdal-0.3c/lib/sl/Makefile.am	Sat Nov 18 12:27:46 2000
+@@ -4,8 +4,6 @@
+ 
+ YFLAGS = -d
+ 
+-include_HEADERS = sl.h
+-
+ lib_LTLIBRARIES = libsl.la libss.la
+ libsl_la_LDFLAGS = -version-info 1:0:1
+ libss_la_LDFLAGS = -version-info 1:1:1
+@@ -31,7 +29,21 @@
+ EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
+ 
+ ssincludedir = $(includedir)/ss
+-ssinclude_HEADERS = ss.h
++buildssinclude = $(buildinclude)/ss
++ssinclude_HEADERS = sl.h ss.h
++
++install-build-headers:: $(ssinclude_HEADERS)
++	@foo='$(ssinclude_HEADERS)'; \
++	for f in $$foo; do \
++		f=`basename $$f`; \
++		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
++		else file="$$f"; fi; \
++		if cmp -s  $$file $(buildssinclude)/$$f 2> /dev/null ; then \
++		: ; else \
++			echo "cp $$file $(buildssinclude)/$$f";\
++			cp $$file $(buildssinclude)/$$f; \
++		fi ; \
++	done
+ 
+ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
+ 
+diff -ruN heimdal-0.3c-old/lib/sl/Makefile.am.bak heimdal-0.3c/lib/sl/Makefile.am.bak
+--- heimdal-0.3c-old/lib/sl/Makefile.am.bak	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3c/lib/sl/Makefile.am.bak	Fri Nov 17 16:14:44 2000
+@@ -0,0 +1,58 @@
++# $Id: Makefile.am,v 1.19 2000/08/19 15:00:39 assar Exp $
++
++include $(top_srcdir)/Makefile.am.common
++
++YFLAGS = -d
++
++lib_LTLIBRARIES = libsl.la libss.la
++libsl_la_LDFLAGS = -version-info 1:0:1
++libss_la_LDFLAGS = -version-info 1:1:1
++
++libsl_la_LIBADD = @LIB_readline@
++libss_la_LIBADD = @LIB_readline@
++
++RENAME_SRC = roken_rename.h strtok_r.c snprintf.c
++
++libsl_la_SOURCES = sl_locl.h sl.c
++libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
++
++EXTRA_libsl_la_SOURCES = strtok_r.c snprintf.c roken_rename.h
++
++# install these?
++
++bin_PROGRAMS = mk_cmds
++
++mk_cmds_SOURCES = make_cmds.c make_cmds.h parse.y lex.l
++
++RENAME_mk_cmds_SRC = roken_rename.h snprintf.c
++
++EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
++
++ssincludedir = $(includedir)/ss
++buildssinclude = $(buildinclude)/ss
++ssinclude_HEADERS = sl.h ss.h
++
++install-build-headers:: $(ssinclude_HEADERS)
++	@foo='$(ssinclude_HEADERS)'; \
++	for f in $$foo; do \
++		f=`basename $$f`; \
++		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
++		else file="$$f"; fi; \
++		if cmp -s  $$file $(buildssinclude)/$$f 2> /dev/null ; then \                : ; else \
++			echo "cp $$file $(buildssinclude)/$$f";\
++			cp $$file $(buildssinclude)/$$f; \
++		fi ; \
++	done
++
++CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
++
++$(mk_cmds_OBJECTS): parse.h
++
++LDADD =						\
++	$(LIB_roken)				\
++	$(LEXLIB)
++
++strtok_r.c:
++	$(LN_S) $(srcdir)/../roken/strtok_r.c .
++snprintf.c:
++	$(LN_S) $(srcdir)/../roken/snprintf.c .
--- heimdal-0.6.3.orig/debian/patches-0.3c/012_maildir
+++ heimdal-0.6.3/debian/patches-0.3c/012_maildir
@@ -0,0 +1,40 @@
+Index: heimdal-0.3c/appl/popper/pop_pass.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/popper/pop_pass.c,v
+retrieving revision 1.1.1.3
+retrieving revision 1.5
+diff -c -r1.1.1.3 -r1.5
+*** heimdal-0.3c/appl/popper/pop_pass.c 2000/05/19 05:23:42 1.1.1.3
+--- heimdal-0.3c/appl/popper/pop_pass.c	2000/05/19 05:33:06	1.5
+***************
+*** 197,203 ****
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+!     snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
+--- 197,218 ----
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+! 
+!     /* Try ~/Maildir */
+!     if (pw->pw_dir != NULL)
+! 	{
+!         snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Maildir");
+! 	}
+!     if(pw->pw_dir != NULL && stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try ~/Mailbox */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Mailbox");
+! 	}
+!     if(pw->pw_dir == NULL || stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try /var/spool/mail/userid */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+! 	}
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
--- heimdal-0.6.3.orig/debian/patches-0.3c/013_cache
+++ heimdal-0.6.3/debian/patches-0.3c/013_cache
@@ -0,0 +1,63 @@
+--- heimdal-0.3c/lib/krb5/cache.c.orig-heimdal	Tue Nov 14 18:41:58 2000
++++ heimdal-0.3c/lib/krb5/cache.c	Tue Nov 14 19:02:07 2000
+@@ -89,11 +89,24 @@
+ {
+     krb5_error_code ret;
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc(sizeof(*p));
+     if(p == NULL)
+ 	return KRB5_CC_NOMEM;
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL)
++        return KRB5_CC_NOMEM;
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL)
++    {
++        free(q);
++        return KRB5_CC_NOMEM;
++    }
++    
++    p->ops = q;
+     *id = p;
+     ret = p->ops->resolve(context, id, residual);
+     if(ret)
+@@ -141,11 +154,24 @@
+ 		krb5_ccache *id)
+ {
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc (sizeof(*p));
+     if (p == NULL)
+ 	return KRB5_CC_NOMEM;
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL)
++        return KRB5_CC_NOMEM;
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL)
++    {
++        free(q);
++        return KRB5_CC_NOMEM;
++    }
++    
++    p->ops = q;
+     *id = p;
+     return p->ops->gen_new(context, id);
+ }
+@@ -248,6 +274,8 @@
+ {
+     krb5_error_code ret;
+     ret = id->ops->close(context, id);
++    free(id->ops->prefix);
++    free((krb5_cc_ops *)id->ops);
+     free(id);
+     return ret;
+ }
--- heimdal-0.6.3.orig/debian/patches-0.3c/020_missingconf
+++ heimdal-0.6.3/debian/patches-0.3c/020_missingconf
@@ -0,0 +1,45 @@
+Index: heimdal-0.3c/kdc.conf
+===================================================================
+RCS file: kdc.conf
+diff -N kdc.conf
+*** /dev/null	Tue Nov 14 18:36:24 2000
+--- heimdal-0.3c/kdc.conf	Fri Nov 17 11:25:12 2000
+***************
+*** 0 ****
+--- 1,22 ----
++ [kdc]
++ #key-file = /var/lib/heimdal-kdc/key-file
++ logging = FILE:/var/log/heimdal-kdc.log
++ 
++ [kdcdefaults]
++ kdc_ports = 88,750
++ 
++ [realms]
++ REALM.ORG = {
++ # everything here needs checking. This might be MIT syntax, not Heimdal's
++ # syntax. At least, everything here should be defaults (or not even used).
++   database_name = /var/lib/heimdal-kdc/heimdal
++   admin_keytab = /var/lib/heimdal-kdc/kadmind.keytab
++   acl_file = /var/lib/heimdal-kdc/kadmind.acl
++   dict_file = /var/lib/heimdal-kdc/kadmind.dict
++   key_stash_file = /var/lib/heimdal-kdc/m-key
++   kadmind_port = 749
++   max_life = 10h 0m 0s
++   max_renewable_life = 7d 0h 0m 0s
++ #  master_key_type = des-cbc-crc
++ #  supported_enctypes = des-cbc-crc:normal des-cbc-crc:v4
++ }
+Index: heimdal-0.3c/logrotate
+===================================================================
+RCS file: logrotate
+diff -N logrotate
+*** /dev/null	Tue Nov 14 18:36:24 2000
+--- heimdal-0.3c/logrotate	Fri Nov 17 11:25:12 2000
+***************
+*** 0 ****
+--- 1,5 ----
++ /var/log/heimdal-kdc.log {
++ 	rotate 5
++ 	weekly
++ 	compress
++ }
--- heimdal-0.6.3.orig/debian/patches-0.3c/021_debian
+++ heimdal-0.6.3/debian/patches-0.3c/021_debian
@@ -0,0 +1,153 @@
+Index: heimdal-0.3c/setconfig
+===================================================================
+RCS file: setconfig
+diff -N setconfig
+*** /dev/null	Tue Nov 14 18:36:24 2000
+--- heimdal-0.3c/setconfig	Fri Nov 17 11:25:12 2000
+***************
+*** 0 ****
+--- 1,94 ----
++ #!/usr/bin/perl -w
++ use strict;
++ use Getopt::Long;
++ 
++ my $section;
++ my $file;
++ 
++ sub set {
++     my $setting = shift;
++     my $oldvalue = shift;
++     my $newvalue = shift;
++     
++     if (defined($newvalue))
++     {
++ 	print OUT "$setting=$newvalue\n"
++ 	     or die "Cannot write to $file.new: $!";
++     }
++ }
++ 
++ sub doit {
++     my $setting;
++     my $value;
++     ($setting,$value) = split("=",shift);
++ 
++     die "No filename given\n" if (!defined($file));
++     die "No section given\n" if (!defined($section));
++ 
++     open(IN,"<$file") or die "Cannot open $file for reading: $!\n";
++     open(OUT,">$file.new") or die "Cannot open $file.new for writing: $!\n";
++ 
++     my $insection = "none";
++     my $done = 0;
++     while (<IN>)
++     {
++ 	my $output = 1;
++ 	if (/^\s*\[([^\]]+)\]\s*$/)
++ 	{
++ 	    if (!$done and $section eq $insection)
++ 	    {
++ 	    	set($setting,undef,$value);
++ 	    	$done = 1;
++ 	    }
++ 	    $insection = $1;
++ 	}
++ 	elsif (/^\s*([\w\.]+)\s*=\s*\{\s*$/)
++ 	{
++ 		$insection = $insection . "::" . $1;
++ 	    	if ($section eq $insection and $setting eq "")
++ 		{
++ 	    		print(OUT "$value = {\n")
++ 				or die "Cannot write to $file.new: $!";
++ 			$done = 1;
++ 			$output = 0;
++ 		}
++ 	}
++ 	elsif (/^\s*\}\s*$/)
++ 	{
++ 		$insection =~ s/::[^:]+//;
++ 	}
++ 	elsif (/^\s*([\w\.]+)\s*=\s*(.*)\s*$/)
++ 	{
++ 	#print "$insection $1=$2\n";
++ 	    if ($section eq $insection and
++ 	    	$setting ne "" and
++ 	    	$setting eq $1)
++ 	    {
++ 		set($setting,$2,$value);
++ 		$output = 0;
++ 		$done = 1;
++ 	    }
++ 	}
++ 	if ($output)
++ 	{
++ 	    print(OUT $_) or die "Cannot write to $file.new: $!";
++ 	}
++     }
++ 	    
++     if (!$done)
++     {
++ 	if ($section ne $insection)
++ 	{
++ 		die "Section $section doesn't exist\n";
++ 	}
++     	set($setting,undef,$value);
++     	$done = 1;
++     }
++ 
++     close(OUT) or die "Cannot close $file.new: $!";
++     close(IN) or die "Cannot close $file: $!";
++     rename("$file.new",$file) or die "Cannot remame $file.new to $file";
++ }
++ 
++ GetOptions("file=s",\$file,"section=s",\$section,"<>",\&doit)
++ 	|| die "Cannot parse command line\n";
+Index: heimdal-0.3c/appl/telnet/telnetd/telnetd.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/telnetd/telnetd.h,v
+retrieving revision 1.1.1.2
+retrieving revision 1.2
+diff -c -r1.1.1.2 -r1.2
+*** heimdal-0.3c/appl/telnet/telnetd/telnetd.h 1999/07/24 08:24:26 1.1.1.2
+--- appl/telnet/telnetd/telnetd.h	2000/01/06 09:22:48	1.2
+***************
+*** 193,199 ****
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	BINDIR "/login"
+  
+  /* fallbacks */
+  
+--- 193,199 ----
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	LIBEXECDIR "/login"
+  
+  /* fallbacks */
+  
+Index: heimdal-0.3c/lib/hdb/hdb.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/lib/hdb/hdb.h,v
+retrieving revision 1.1.1.4
+retrieving revision 1.3
+diff -c -r1.1.1.4 -r1.3
+*** heimdal-0.3c/lib/hdb/hdb.h 2000/07/31 03:16:43 1.1.1.4
+--- heimdal-0.3c/lib/hdb/hdb.h	2000/07/31 03:22:57	1.3
+***************
+*** 78,84 ****
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/heimdal"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
+--- 78,84 ----
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/lib/heimdal-kdc"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
--- heimdal-0.6.3.orig/debian/patches-0.3c/030_autotools
+++ heimdal-0.6.3/debian/patches-0.3c/030_autotools
@@ -0,0 +1,20878 @@
+diff -ruN heimdal-0.3c-old/Makefile.in heimdal-0.3c/Makefile.in
+--- heimdal-0.3c-old/Makefile.in	Wed Sep 20 20:55:32 2000
++++ heimdal-0.3c/Makefile.in	Tue Nov 28 09:56:22 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -237,16 +247,17 @@
+ 		cf/find-if-not-broken.m4 cf/grok-type.m4 \
+ 		cf/have-pragma-weak.m4 cf/have-struct-field.m4 \
+ 		cf/have-type.m4 cf/have-types.m4 cf/krb-bigendian.m4 \
+-		cf/krb-find-db.m4 cf/krb-func-getcwd-broken.m4 \
+-		cf/krb-func-getlogin.m4 cf/krb-ipv6.m4 \
+-		cf/krb-prog-ln-s.m4 cf/krb-prog-ranlib.m4 \
+-		cf/krb-prog-yacc.m4 cf/krb-readline.m4 \
+-		cf/krb-struct-spwd.m4 cf/krb-struct-winsize.m4 \
+-		cf/krb-sys-aix.m4 cf/krb-sys-nextstep.m4 \
+-		cf/krb-version.m4 cf/mips-abi.m4 cf/misc.m4 \
+-		cf/need-proto.m4 cf/osfc2.m4 cf/proto-compat.m4 \
+-		cf/retsigtype.m4 cf/roken-frag.m4 cf/roken.m4 \
+-		cf/shared-libs.m4 cf/test-package.m4 cf/wflags.m4
++		cf/krb-com_err.m4 cf/krb-find-db.m4 \
++		cf/krb-func-getcwd-broken.m4 cf/krb-func-getlogin.m4 \
++		cf/krb-ipv6.m4 cf/krb-prog-ln-s.m4 \
++		cf/krb-prog-ranlib.m4 cf/krb-prog-yacc.m4 \
++		cf/krb-readline.m4 cf/krb-ss.m4 cf/krb-struct-spwd.m4 \
++		cf/krb-struct-winsize.m4 cf/krb-sys-aix.m4 \
++		cf/krb-sys-nextstep.m4 cf/krb-version.m4 cf/mips-abi.m4 \
++		cf/misc.m4 cf/need-proto.m4 cf/osfc2.m4 \
++		cf/proto-compat.m4 cf/retsigtype.m4 cf/roken-frag.m4 \
++		cf/roken.m4 cf/shared-libs.m4 cf/test-package.m4 \
++		cf/wflags.m4
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+@@ -287,10 +298,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -369,6 +381,7 @@
+ 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ 	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
++	  && chmod -R u+w .. \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+ 	  && rm -f $(distdir).tar.gz \
+diff -ruN heimdal-0.3c-old/aclocal.m4 heimdal-0.3c/aclocal.m4
+--- heimdal-0.3c-old/aclocal.m4	Wed Sep 20 20:55:29 2000
++++ heimdal-0.3c/aclocal.m4	Tue Nov 28 09:55:47 2000
+@@ -1,14 +1,15 @@
+-dnl ./aclocal.m4 generated automatically by aclocal 1.4a
++# aclocal.m4 generated automatically by aclocal 1.4a
+ 
+-dnl Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl This program is distributed in the hope that it will be useful,
+-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-dnl PARTICULAR PURPOSE.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
++# Free Software Foundation, Inc.
++# This file 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
+ 
+ dnl $Id: acinclude.m4,v 1.15 1998/05/23 14:54:53 joda Exp $
+ dnl
+@@ -49,32 +50,40 @@
+ ])])
+ # Like AC_CONFIG_HEADER, but automatically create stamp file.
+ 
+-AC_DEFUN(AM_CONFIG_HEADER,
+-[AC_PREREQ([2.12])
+-AC_CONFIG_HEADER([$1])
+-dnl When config.status generates a header, we must update the stamp-h file.
+-dnl This file resides in the same directory as the config header
+-dnl that is generated.  We must strip everything past the first ":",
+-dnl and everything past the last "/".
+-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+-<<am_indx=1
+-for am_file in <<$1>>; do
+-  case " <<$>>CONFIG_HEADERS " in
+-  *" <<$>>am_file "*<<)>>
+-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+-    ;;
+-  esac
+-  am_indx=`expr "<<$>>am_indx" + 1`
+-done<<>>dnl>>)
+-changequote([,]))])
++# serial 3
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  We must strip everything past the first ":",
++# and everything past the last "/".
++
++AC_PREREQ([2.12])
++
++AC_DEFUN([AM_CONFIG_HEADER],
++[AC_CONFIG_HEADER([$1])
++  AC_OUTPUT_COMMANDS(
++   ifelse(patsubst([$1], [[^ ]], []),
++	  [],
++	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
++	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
++  [am_indx=1
++  for am_file in $1; do
++    case " $CONFIG_HEADERS " in
++    *" $am_file "*)
++      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
++      ;;
++    esac
++    am_indx=\`expr \$am_indx + 1\`
++  done])
++])
+ 
+ # Do all the work for Automake.  This macro actually does too much --
+ # some checks are only needed if your package does certain things.
+ # But this isn't really a big deal.
+ 
+-# serial 2
++# serial 3
++
++AC_PREREQ([2.13])
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+@@ -92,12 +101,11 @@
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
+ # ----------------------------------------------
+-AC_DEFUN(AM_INIT_AUTOMAKE,
++AC_DEFUN([AM_INIT_AUTOMAKE],
+ [dnl We require 2.13 because we rely on SHELL being computed by configure.
+-AC_PREREQ([2.13])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ # test to see if srcdir already configured
+-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
++if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+@@ -121,8 +129,8 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG(AMTAR, tar)
+ AM_MISSING_INSTALL_SH
+-dnl We need awk for the "check" target.  The system "awk" is bad on
+-dnl some platforms.
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+@@ -141,7 +149,7 @@
+ # Check to make sure that the build environment is sane.
+ #
+ 
+-AC_DEFUN(AM_SANITY_CHECK,
++AC_DEFUN([AM_SANITY_CHECK],
+ [AC_MSG_CHECKING([whether build environment is sane])
+ # Just in case
+ sleep 1
+@@ -180,15 +188,15 @@
+ rm -f conftest*
+ AC_MSG_RESULT(yes)])
+ 
+-dnl AM_MISSING_PROG(NAME, PROGRAM)
+-AC_DEFUN(AM_MISSING_PROG, [
++# AM_MISSING_PROG(NAME, PROGRAM)
++AC_DEFUN([AM_MISSING_PROG], [
+ AC_REQUIRE([AM_MISSING_HAS_RUN])
+ $1=${$1-"${am_missing_run}$2"}
+ AC_SUBST($1)])
+ 
+-dnl Like AM_MISSING_PROG, but only looks for install-sh.
+-dnl AM_MISSING_INSTALL_SH()
+-AC_DEFUN(AM_MISSING_INSTALL_SH, [
++# Like AM_MISSING_PROG, but only looks for install-sh.
++# AM_MISSING_INSTALL_SH()
++AC_DEFUN([AM_MISSING_INSTALL_SH], [
+ AC_REQUIRE([AM_MISSING_HAS_RUN])
+ if test -z "$install_sh"; then
+    install_sh="$ac_aux_dir/install-sh"
+@@ -200,13 +208,13 @@
+ fi
+ AC_SUBST(install_sh)])
+ 
+-dnl AM_MISSING_HAS_RUN.
+-dnl Define MISSING if not defined so far and test if it supports --run.
+-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
++# AM_MISSING_HAS_RUN.
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN], [
+ test x"${MISSING+set}" = xset || \
+-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+-dnl Use eval to expand $SHELL
++  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
++# Use eval to expand $SHELL
+ if eval "$MISSING --run :"; then
+   am_missing_run="$MISSING --run "
+ else
+@@ -216,14 +224,14 @@
+ fi
+ ])
+ 
+-dnl See how the compiler implements dependency checking.
+-dnl Usage:
+-dnl AM_DEPENDENCIES(NAME)
+-dnl NAME is "CC", "CXX" or "OBJC".
++# See how the compiler implements dependency checking.
++# Usage:
++# AM_DEPENDENCIES(NAME)
++# NAME is "CC", "CXX" or "OBJC".
+ 
+-dnl We try a few techniques and use that to set a single cache variable.
++# We try a few techniques and use that to set a single cache variable.
+ 
+-AC_DEFUN(AM_DEPENDENCIES,[
++AC_DEFUN([AM_DEPENDENCIES],[
+ AC_REQUIRE([AM_SET_DEPDIR])
+ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
+ ifelse([$1],CC,[
+@@ -259,10 +267,13 @@
+       ;;
+     none) break ;;
+     esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
+     if depmode="$depmode" \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
++       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
+        grep conftest.h conftest.Po > /dev/null 2>&1; then
+       am_cv_[$1]_dependencies_compiler_type="$depmode"
+       break
+@@ -279,10 +290,10 @@
+ AC_SUBST([$1]DEPMODE)
+ ])
+ 
+-dnl Choose a directory name for dependency files.
+-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in AM_DEPENDENCIES
+ 
+-AC_DEFUN(AM_SET_DEPDIR,[
++AC_DEFUN([AM_SET_DEPDIR],[
+ if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+   DEPDIR=.deps
+ else
+@@ -291,7 +302,7 @@
+ AC_SUBST(DEPDIR)
+ ])
+ 
+-AC_DEFUN(AM_DEP_TRACK,[
++AC_DEFUN([AM_DEP_TRACK],[
+ AC_ARG_ENABLE(dependency-tracking,
+ [  --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors])
+@@ -316,16 +327,16 @@
+ popdef([subst])
+ ])
+ 
+-dnl Generate code to set up dependency tracking.
+-dnl This macro should only be invoked once -- use via AC_REQUIRE.
+-dnl Usage:
+-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
++# Generate code to set up dependency tracking.
++# This macro should only be invoked once -- use via AC_REQUIRE.
++# Usage:
++# AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+-dnl
+-dnl This code is only required when automatic dependency tracking
+-dnl is enabled.  FIXME.  This creates each `.P' file that we will
+-dnl need in order to bootstrap the dependency handling code.
+-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
+ AC_OUTPUT_COMMANDS([
+ test x"$AMDEP" != x"" ||
+ for mf in $CONFIG_FILES; do
+@@ -368,9 +379,9 @@
+ ac_aux_dir="$ac_aux_dir"])])
+ 
+ 
+-dnl AM_PROG_LEX
+-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+-AC_DEFUN(AM_PROG_LEX,
++# AM_PROG_LEX
++# Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
++AC_DEFUN([AM_PROG_LEX],
+ [AC_REQUIRE([AM_MISSING_HAS_RUN])
+ AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
+ AC_PROG_LEX
+@@ -526,23 +537,20 @@
+ 
+ 
+ 
+-# serial 44 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])])
+-AC_DEFUN(_AC_PROG_LIBTOOL,
++# serial 40 AC_PROG_LIBTOOL
++AC_DEFUN(AC_PROG_LIBTOOL,
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ 
+ # Save cache, so that ltconfig can load it
+ AC_CACHE_SAVE
+ 
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+ || AC_MSG_ERROR([libtool configure failed])
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -567,28 +575,18 @@
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
+-# Only perform the check for file, if the check method requires it
+-case "$deplibs_check_method" in
+-file_magic*)
+-  if test "$file_magic_cmd" = '${MAGIC}'; then
+-    AC_PATH_MAGIC
+-  fi
+-  ;;
++case "$target" in
++NONE) lt_target="$host" ;;
++*) lt_target="$target" ;;
+ esac
+ 
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
+-
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -605,15 +603,9 @@
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+ 
+-AC_ARG_WITH(pic,
+-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+-     pic_mode="$withval", pic_mode=default)
+-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
+-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+-
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+-case "$host" in
++case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+@@ -638,10 +630,7 @@
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_SAVE
+-     AC_LANG_C
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_RESTORE])
++    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+     CFLAGS="$SAVE_CFLAGS"
+@@ -653,31 +642,8 @@
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-
+-  # recent cygwin and mingw systems supply a stub DllMain which the user
+-  # can override, but on older systems we have to supply one
+-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
+-    [AC_TRY_LINK([],
+-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+-      DllMain (0, 0, 0);],
+-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
+-
+-  case "$host/$CC" in
+-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+-    # old mingw systems require "-dll" to link a DLL, while more recent ones
+-    # require "-mdll"
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -mdll"
+-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
+-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
+-    CFLAGS="$SAVE_CFLAGS" ;;
+-  *-*-cygwin*)
+-    # cygwin systems need to pass --dll to the linker, and not link
+-    # crt.o which will require a WinMain@16 definition.
+-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
+-  esac
+   ;;
+-  ])
++])
+ esac
+ ])
+ 
+@@ -783,94 +749,10 @@
+ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+ ])
+ 
+-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
++# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+ AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_FAST_INSTALL(no)])
+ 
+-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
+-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
+-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
+-#   `both'.
+-AC_DEFUN(AC_LIBTOOL_PICMODE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)])
+-
+-
+-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+-AC_DEFUN(AC_PATH_TOOL_PREFIX,
+-[AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC,
+-[case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac])
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  AC_MSG_RESULT($MAGIC)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-])
+-
+-
+-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+-AC_DEFUN(AC_PATH_MAGIC,
+-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+-if test -z "$lt_cv_path_MAGIC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
+-  else
+-    MAGIC=:
+-  fi
+-fi
+-])
+-
+-
+ # AC_PROG_LD - find the path to the GNU or non-GNU linker
+ AC_DEFUN(AC_PROG_LD,
+ [AC_ARG_WITH(gnu-ld,
+@@ -883,13 +765,7 @@
+ if test "$ac_cv_prog_gcc" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   AC_MSG_CHECKING([for ld used by GCC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
++  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+   case "$ac_prog" in
+     # Accept absolute paths.
+ changequote(,)dnl
+@@ -956,170 +832,8 @@
+ else
+   ac_cv_prog_gnu_ld=no
+ fi])
+-with_gnu_ld=$ac_cv_prog_gnu_ld
+ ])
+ 
+-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN(AC_PROG_LD_RELOAD_FLAG,
+-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
+-[lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
+-])
+-
+-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN(AC_DEPLIBS_CHECK_METHOD,
+-[AC_CACHE_CHECK([how to recognise dependant libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='${MAGIC}'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [regex]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
+-
+-case "$host_os" in
+-aix4*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-bsdi4*)
+-  changequote(,)dnl
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-  changequote([, ])dnl
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+-
+-cygwin* | mingw*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+-  ;;
+-
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case "$host_cpu" in
+-    i*86 )
+-      changequote(,)dnl
+-      lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
+-      changequote([, ])dnl
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20*)
+-  # TODO:  Does this work for hpux-11 too?
+-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
+-
+-irix5* | irix6*)
+-  case "$host_os" in
+-  irix5*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case "$LD" in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-    changequote([, ])dnl
+-    ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux-gnu*)
+-  case "$host_cpu" in
+-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-    changequote([, ])dnl
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  ;;
+-
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+-  else
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-    changequote([, ])dnl
+-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-  fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case "$host_vendor" in
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  motorola)
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-    changequote([, ])dnl
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-])
+-
+-
+ # AC_PROG_NM - find the path to a BSD-compatible name lister
+ AC_DEFUN(AC_PROG_NM,
+ [AC_MSG_CHECKING([for BSD-compatible nm])
+@@ -1131,19 +845,18 @@
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+     test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -B"
++      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -B"
+ 	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -p"
++      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -p"
+ 	break
+       else
+-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
++	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ 	continue # so that we can try to find one that supports BSD flags
+       fi
+     fi
+@@ -1159,7 +872,7 @@
+ AC_DEFUN(AC_CHECK_LIBM,
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+-case "$host" in
++case "$lt_target" in
+ *-*-beos* | *-*-cygwin*)
+   # These system don't have libm
+   ;;
+@@ -1999,7 +1712,7 @@
+ 
+ # Define a conditional.
+ 
+-AC_DEFUN(AM_CONDITIONAL,
++AC_DEFUN([AM_CONDITIONAL],
+ [AC_SUBST($1_TRUE)
+ AC_SUBST($1_FALSE)
+ if $2; then
+@@ -2334,49 +2047,6 @@
+ #endif])
+ ])
+ 
+-dnl $Id: krb-func-getcwd-broken.m4,v 1.2 1999/03/01 13:03:32 joda Exp $
+-dnl
+-dnl
+-dnl test for broken getcwd in (SunOS braindamage)
+-dnl
+-
+-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
+-if test "$ac_cv_func_getcwd" = yes; then
+-AC_MSG_CHECKING(if getcwd is broken)
+-AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
+-ac_cv_func_getcwd_broken=no
+-
+-AC_TRY_RUN([
+-#include <errno.h>
+-char *getcwd(char*, int);
+-
+-void *popen(char *cmd, char *mode)
+-{
+-	errno = ENOTTY;
+-	return 0;
+-}
+-
+-int main()
+-{
+-	char *ret;
+-	ret = getcwd(0, 1024);
+-	if(ret == 0 && errno == ENOTTY)
+-		return 0;
+-	return 1;
+-}
+-], ac_cv_func_getcwd_broken=yes,:,:)
+-])
+-if test "$ac_cv_func_getcwd_broken" = yes; then
+-	AC_DEFINE(BROKEN_GETCWD, 1, [Define if getcwd is broken (like in SunOS 4).])dnl
+-	LIBOBJS="$LIBOBJS getcwd.o"
+-	AC_SUBST(LIBOBJS)dnl
+-	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
+-else
+-	AC_MSG_RESULT([seems ok])
+-fi
+-fi
+-])
+-
+ dnl $Id: proto-compat.m4,v 1.3 1999/03/01 13:03:48 joda Exp $
+ dnl
+ dnl
+@@ -2522,7 +2192,7 @@
+ dnl
+ dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+ 
+-AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
++AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
+ 
+ AC_DEFUN(AC_TEST_PACKAGE_NEW,[
+ AC_ARG_WITH($1,
+@@ -2559,7 +2229,7 @@
+ header_dirs=
+ lib_dirs=
+ d='$5'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -2592,6 +2262,7 @@
+ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+ 	$1_includedir="$ires"
+ 	$1_libdir="$lres"
++	DIR_$1=
+ 	INCLUDE_$1="-I$$1_includedir"
+ 	LIB_$1="-L$$1_libdir $3"
+ 	ifval([$6],
+@@ -2600,6 +2271,7 @@
+ 	with_$1=yes
+ 	AC_MSG_RESULT([headers $ires, libraries $lres])
+ else
++	DIR_$1="$1"
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	with_$1=no
+@@ -2608,6 +2280,7 @@
+ dnl ifval([$6],
+ dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
+ dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+@@ -2985,19 +2658,95 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++ 	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $LIB_el_init"
+ else
+-	LIB_readline='$(top_builddir)/lib/editline/libeditline.a'
++ 	DIR_readline="editline"
++	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ AC_DEFINE(HAVE_READLINE, 1, 
+ 	[Define if you have a readline compatible library.])dnl
+ 
+ ])
++
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_COM_ERR,[
++dnl com_err
++
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++AC_DEFINE(HAVE_COM_ERR, 1, 
++	[Define if you have a com_err compatible library.])dnl
++
++])
++AC_SUBST(COMPILE_ET)
++
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_SS,[
++dnl com_err
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++AC_DEFINE(HAVE_SS, 1, 
++	[Define if you have a ss compatible library.])dnl
++
++])
++AC_SUBST(LIB_sl)
++
+ dnl $Id: auth-modules.m4,v 1.1 1999/03/21 13:48:00 joda Exp $
+ dnl
+ dnl Figure what authentication modules should be built
+diff -ruN heimdal-0.3c-old/admin/Makefile.in heimdal-0.3c/admin/Makefile.in
+--- heimdal-0.3c-old/admin/Makefile.in	Wed Sep 20 20:55:45 2000
++++ heimdal-0.3c/admin/Makefile.in	Tue Nov 28 09:56:30 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -123,13 +126,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline)
++INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline) $(INCLUDE_ss)
+ 
+ AM_CFLAGS =  $(WFLAGS) $(CPPFLAGS_roken)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -211,7 +221,7 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(top_builddir)/lib/des/libdes.la \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+ 
+@@ -238,7 +248,7 @@
+ ktutil_LDADD = $(LDADD)
+ ktutil_DEPENDENCIES =  $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ $(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/des/libdes.la \
+-$(top_builddir)/lib/asn1/libasn1.la $(top_builddir)/lib/sl/libsl.la
++$(top_builddir)/lib/asn1/libasn1.la
+ ktutil_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3c-old/appl/Makefile.in heimdal-0.3c/appl/Makefile.in
+--- heimdal-0.3c-old/appl/Makefile.in	Wed Sep 20 20:55:46 2000
++++ heimdal-0.3c/appl/Makefile.in	Tue Nov 28 09:56:30 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -271,10 +281,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3c-old/appl/afsutil/Makefile.in heimdal-0.3c/appl/afsutil/Makefile.in
+--- heimdal-0.3c-old/appl/afsutil/Makefile.in	Wed Sep 20 20:55:47 2000
++++ heimdal-0.3c/appl/afsutil/Makefile.in	Tue Nov 28 09:56:31 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/dceutils/Makefile.in heimdal-0.3c/appl/dceutils/Makefile.in
+--- heimdal-0.3c-old/appl/dceutils/Makefile.in	Wed Sep 20 20:55:57 2000
++++ heimdal-0.3c/appl/dceutils/Makefile.in	Tue Nov 28 09:56:36 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -238,8 +248,7 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
+ depcomp = 
+-DIST_COMMON =  ChangeLog Makefile.am Makefile.in appl/dceutils/compile \
+-compile
++DIST_COMMON =  ChangeLog Makefile.am Makefile.in compile
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -360,7 +369,6 @@
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+ 
+ distdir: $(DISTFILES)
+-	$(mkinstalldirs) $(distdir)/appl/dceutils
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+diff -ruN heimdal-0.3c-old/appl/ftp/Makefile.in heimdal-0.3c/appl/ftp/Makefile.in
+--- heimdal-0.3c-old/appl/ftp/Makefile.in	Wed Sep 20 20:55:47 2000
++++ heimdal-0.3c/appl/ftp/Makefile.in	Tue Nov 28 09:56:31 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -252,10 +262,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3c-old/appl/ftp/common/Makefile.in heimdal-0.3c/appl/ftp/common/Makefile.in
+--- heimdal-0.3c-old/appl/ftp/common/Makefile.in	Wed Sep 20 20:55:47 2000
++++ heimdal-0.3c/appl/ftp/common/Makefile.in	Tue Nov 28 09:56:31 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/ftp/ftp/Makefile.in heimdal-0.3c/appl/ftp/ftp/Makefile.in
+--- heimdal-0.3c-old/appl/ftp/ftp/Makefile.in	Wed Sep 20 20:55:48 2000
++++ heimdal-0.3c/appl/ftp/ftp/Makefile.in	Tue Nov 28 09:56:31 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/ftp/ftpd/Makefile.in heimdal-0.3c/appl/ftp/ftpd/Makefile.in
+--- heimdal-0.3c-old/appl/ftp/ftpd/Makefile.in	Wed Sep 20 20:55:49 2000
++++ heimdal-0.3c/appl/ftp/ftpd/Makefile.in	Tue Nov 28 09:56:32 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/kf/Makefile.in heimdal-0.3c/appl/kf/Makefile.in
+--- heimdal-0.3c-old/appl/kf/Makefile.in	Wed Sep 20 20:55:56 2000
++++ heimdal-0.3c/appl/kf/Makefile.in	Tue Nov 28 09:56:36 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/kx/Makefile.in heimdal-0.3c/appl/kx/Makefile.in
+--- heimdal-0.3c-old/appl/kx/Makefile.in	Wed Sep 20 20:55:49 2000
++++ heimdal-0.3c/appl/kx/Makefile.in	Tue Nov 28 09:56:32 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+@@ -128,7 +131,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -168,6 +171,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/login/Makefile.in heimdal-0.3c/appl/login/Makefile.in
+--- heimdal-0.3c-old/appl/login/Makefile.in	Wed Sep 20 20:55:50 2000
++++ heimdal-0.3c/appl/login/Makefile.in	Tue Nov 28 09:56:32 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/otp/Makefile.in heimdal-0.3c/appl/otp/Makefile.in
+--- heimdal-0.3c-old/appl/otp/Makefile.in	Wed Sep 20 20:55:50 2000
++++ heimdal-0.3c/appl/otp/Makefile.in	Tue Nov 28 09:56:33 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/popper/Makefile.in heimdal-0.3c/appl/popper/Makefile.in
+--- heimdal-0.3c-old/appl/popper/Makefile.in	Wed Sep 20 20:55:51 2000
++++ heimdal-0.3c/appl/popper/Makefile.in	Tue Nov 28 09:56:33 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/push/Makefile.in heimdal-0.3c/appl/push/Makefile.in
+--- heimdal-0.3c-old/appl/push/Makefile.in	Wed Sep 20 20:55:51 2000
++++ heimdal-0.3c/appl/push/Makefile.in	Tue Nov 28 09:56:33 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/rsh/Makefile.in heimdal-0.3c/appl/rsh/Makefile.in
+--- heimdal-0.3c-old/appl/rsh/Makefile.in	Wed Sep 20 20:55:52 2000
++++ heimdal-0.3c/appl/rsh/Makefile.in	Tue Nov 28 09:56:34 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/su/Makefile.in heimdal-0.3c/appl/su/Makefile.in
+--- heimdal-0.3c-old/appl/su/Makefile.in	Wed Sep 20 20:55:53 2000
++++ heimdal-0.3c/appl/su/Makefile.in	Tue Nov 28 09:56:34 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/telnet/Makefile.in heimdal-0.3c/appl/telnet/Makefile.in
+--- heimdal-0.3c-old/appl/telnet/Makefile.in	Wed Sep 20 20:55:53 2000
++++ heimdal-0.3c/appl/telnet/Makefile.in	Tue Nov 28 09:56:34 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -254,10 +264,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3c-old/appl/telnet/libtelnet/Makefile.in heimdal-0.3c/appl/telnet/libtelnet/Makefile.in
+--- heimdal-0.3c-old/appl/telnet/libtelnet/Makefile.in	Wed Sep 20 20:55:54 2000
++++ heimdal-0.3c/appl/telnet/libtelnet/Makefile.in	Tue Nov 28 09:56:35 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/telnet/telnet/Makefile.in heimdal-0.3c/appl/telnet/telnet/Makefile.in
+--- heimdal-0.3c-old/appl/telnet/telnet/Makefile.in	Wed Sep 20 20:55:54 2000
++++ heimdal-0.3c/appl/telnet/telnet/Makefile.in	Tue Nov 28 09:56:35 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/telnet/telnetd/Makefile.in heimdal-0.3c/appl/telnet/telnetd/Makefile.in
+--- heimdal-0.3c-old/appl/telnet/telnetd/Makefile.in	Wed Sep 20 20:55:55 2000
++++ heimdal-0.3c/appl/telnet/telnetd/Makefile.in	Tue Nov 28 09:56:35 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/test/Makefile.in heimdal-0.3c/appl/test/Makefile.in
+--- heimdal-0.3c-old/appl/test/Makefile.in	Wed Sep 20 20:55:55 2000
++++ heimdal-0.3c/appl/test/Makefile.in	Tue Nov 28 09:56:35 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/appl/xnlock/Makefile.in heimdal-0.3c/appl/xnlock/Makefile.in
+--- heimdal-0.3c-old/appl/xnlock/Makefile.in	Wed Sep 20 20:55:53 2000
++++ heimdal-0.3c/appl/xnlock/Makefile.in	Tue Nov 28 09:56:34 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+@@ -128,7 +131,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -194,7 +204,7 @@
+ @HAVE_X_TRUE@bin_PROGRAMS = @HAVE_X_TRUE@xnlock
+ @HAVE_X_FALSE@bin_PROGRAMS = 
+ 
+-man1_MANS = xnlock.man
++man1_MANS = xnlock.1
+ 
+ EXTRA_DIST = $(man1_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \
+ 	nose.down nose.front nose.left.front nose.right.front
+@@ -248,6 +258,8 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  xnlock.c
++man1dir = $(mandir)/man1
++MANS = $(man1_MANS)
+ depcomp = 
+ DIST_COMMON =  README ChangeLog Makefile.am Makefile.in
+ 
+@@ -328,6 +340,47 @@
+ .c.lo:
+ 	$(LTCOMPILE) -c -o $@ $<
+ 
++install-man1:
++	$(mkinstalldirs) $(DESTDIR)$(man1dir)
++	@list='$(man1_MANS)'; \
++	l2='$(man_MANS)'; for i in $$l2; do \
++	  case "$$i" in \
++	    *.1*) list="$$list $$i" ;; \
++	  esac; \
++	done; \
++	for i in $$list; do \
++	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
++	  else file=$$i; fi; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
++	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
++	done
++
++uninstall-man1:
++	@list='$(man1_MANS)'; \
++	l2='$(man_MANS)'; for i in $$l2; do \
++	  case "$$i" in \
++	    *.1*) list="$$list $$i" ;; \
++	  esac; \
++	done; \
++	for i in $$list; do \
++	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
++	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
++	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
++	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
++	done
++install-man: $(MANS)
++	@$(NORMAL_INSTALL)
++	$(MAKE) $(AM_MAKEFLAGS) install-man1
++uninstall-man:
++	@$(NORMAL_UNINSTALL)
++	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
++
+ tags: TAGS
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -390,20 +443,20 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-exec: install-exec-am
+ 
+-install-data-am: install-data-local
++install-data-am: install-man install-data-local
+ install-data: install-data-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+-uninstall-am: uninstall-binPROGRAMS
++uninstall-am: uninstall-binPROGRAMS uninstall-man
+ uninstall: uninstall-am
+-all-am: Makefile $(PROGRAMS) all-local
++all-am: Makefile $(PROGRAMS) $(MANS) all-local
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir)
++	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+ 
+ 
+ mostlyclean-generic:
+@@ -446,14 +499,15 @@
+ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+ mostlyclean-compile distclean-compile clean-compile \
+ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-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 install-strip installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++clean-libtool maintainer-clean-libtool install-man1 uninstall-man1 \
++install-man uninstall-man tags mostlyclean-tags distclean-tags \
++clean-tags maintainer-clean-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 \
++install-strip installdirs mostlyclean-generic distclean-generic \
++clean-generic maintainer-clean-generic clean mostlyclean distclean \
++maintainer-clean
+ 
+ 
+ install-suid-programs:
+diff -ruN heimdal-0.3c-old/configure heimdal-0.3c/configure
+--- heimdal-0.3c-old/configure	Wed Sep 20 20:56:50 2000
++++ heimdal-0.3c/configure	Tue Nov 28 09:56:48 2000
+@@ -1,12 +1,47 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.255
++# From configure.in Revision: 1.255 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.14a.
++# Generated by Autoconf 2.49b for heimdal 0.3c.
+ #
+-# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
++# Report bugs to <heimdal-bugs@pdc.kth.se>.
++#
++# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+ # Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++
++# Support unset when possible.
++if (unset FOO) >/dev/null 2>&1; then
++  ac_unset=unset
++else
++  ac_unset=false
++fi
++
++# NLS nuisances.
++$ac_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
++$ac_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
++$ac_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
++$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
++$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
++$ac_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
++$ac_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
++$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++ac_nl='
++'
++IFS=" 	$ac_nl"
++
++# CDPATH.
++$ac_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+ 
+ #
+ # Initializations.
+@@ -445,6 +480,34 @@
+   fi
+ fi
+ srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ 
+ #
+ # Report the --help message.
+@@ -458,7 +521,7 @@
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+ To assign environment variables (e.g., CC, CFLAGS...), specify them as
+-VAR=VALUE.  See below for descriptions of useful variables.
++VAR=VALUE.  See below for descriptions of some of the useful variables.
+ 
+ Defaults for the options are specified in brackets.
+ 
+@@ -550,7 +613,6 @@
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-mips-abi=abi     ABI to use for IRIX (32, n32, or 64)
+   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+-  --with-pic              try to use only PIC/non-PIC objects default=use both
+   --without-berkeley-db   if you don't want berkeley db
+   --without-ipv6	do not enable IPv6 support
+   --with-openldap=dir                use openldap in dir
+@@ -562,21 +624,29 @@
+   --with-readline=dir                use readline in dir
+   --with-readline-lib=dir            use readline libraries in dir
+   --with-readline-include=dir        use readline headers in dir
++  --with-com_err=dir                use com_err in dir
++  --with-com_err-lib=dir            use com_err libraries in dir
++  --with-com_err-include=dir        use com_err headers in dir
++  --with-ss=dir                use ss in dir
++  --with-ss-lib=dir            use ss libraries in dir
++  --with-ss-include=dir        use ss headers in dir
+   --with-hesiod=dir                use hesiod in dir
+   --with-hesiod-lib=dir            use hesiod libraries in dir
+   --with-hesiod-include=dir        use hesiod headers in dir
+   --with-x                use the X Window System
+-  --without-ipv6	do not enable IPv6 support
+ 
+-Some relevant environment variables, which you can use to override the
+-choices made by the configure script or to help it to find libraries and
+-programs with nonstandard names/locations:
++Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+               headers in a nonstandard directory <include dir>
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++Report bugs to <heimdal-bugs@pdc.kth.se>.
+ EOF
+ fi
+ 
+@@ -599,7 +669,10 @@
+     esac
+ 
+     # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_sub_srcdir/configure; then
++    if test -f $ac_sub_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_sub_srcdir/configure; then
+       echo
+       $SHELL $ac_sub_srcdir/configure  --help=recursive
+     elif test -f $ac_sub_srcdir/configure.in; then
+@@ -615,45 +688,15 @@
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\EOF
+-configure (heimdal 0.3c) 2.14a
++configure (heimdal 0.3c) 2.49b
+ 
+-Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
++Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+ Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ EOF
+   exit 0
+ fi
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
+-fi
+-
+-# Support unset when possible.
+-if (unset FOO) >/dev/null 2>&1; then
+-  ac_unset=unset
+-else
+-  ac_unset=false
+-fi
+-
+-# NLS nuisances.
+-$ac_unset LANG || test "${LANG+set}" != set || LANG=C && export LANG
+-$ac_unset LC_ALL || test "${LC_ALL+set}" != set || LC_ALL=C && export LC_ALL
+-$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || LC_CTYPE=C && export LC_CTYPE
+-$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || LANGUAGE=C && export LANGUAGE
+-$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || LC_MESSAGES=C && export LC_MESSAGES
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-ac_nl='
+-'
+-IFS=" 	$ac_nl"
+-
+-# CDPATH.
+-$ac_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
+ 
+ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+ 
+@@ -698,7 +741,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by configure (heimdal 0.3c) 2.14a, executed with
++It was created by configure (heimdal 0.3c) 2.49b, executed with
+  > $0 $ac_configure_args
+ " >&5
+ 
+@@ -707,6 +750,7 @@
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
+ echo >confdefs.h
+ 
++# Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -z "$CONFIG_SITE"; then
+   if test "x$prefix" != xNONE; then
+@@ -737,12 +781,42 @@
+   >$cache_file
+ fi
+ 
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_suggest_removing_cache=false
++for ac_var in `(set) 2>&1 |
++               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      echo "configure: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2
++      ac_suggest_removing_cache=: ;;
++    ,set)
++      echo "configure: WARNING: \`$ac_var' was not set in the previous run" >&2
++      ac_suggest_removing_cache=: ;;
++    ,);;
++    *)
++      if test "x$ac_old_val" != "x$ac_new_val"; then
++        echo "configure: WARNING: \`$ac_var' has changed since the previous run:" >&2
++        echo "configure: WARNING:   former value:  $ac_old_val" >&2
++        echo "configure: WARNING:   current value: $ac_new_val" >&2
++        ac_suggest_removing_cache=:
++      fi;;
++  esac
++done
++if $ac_suggest_removing_cache; then
++  echo "configure: WARNING: changes in the environment can compromise the build" >&2
++  echo "configure: WARNING: consider removing $cache_file and starting over" >&2
++fi
++
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+@@ -753,27 +827,18 @@
+ 
+ ac_config_headers="$ac_config_headers include/config.h"
+ 
+-ac_config_commands="$ac_config_commands default-1"
++  ac_config_commands="$ac_config_commands default-1"
+ 
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-
+-case "${CC+set} $ac_configure_args" in
+- *" CC="* );;
+- "set "*) ac_configure_args="CC='$CC' $ac_configure_args";;
+-esac
+-case "${CFLAGS+set} $ac_configure_args" in
+- *" CFLAGS="* );;
+- "set "*) ac_configure_args="CFLAGS='$CFLAGS' $ac_configure_args";;
+-esac
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "configure:678: checking for $ac_word" >&5
++echo "configure:841: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -786,7 +851,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ break
+ done
+@@ -795,18 +860,19 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "configure:699: result: $CC" >&5
++  echo "configure:863: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "configure:702: result: no" >&5
++  echo "configure:866: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++fi
+ if test -z "$ac_cv_prog_CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "gcc", so it can be a program name with args.
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "configure:709: checking for $ac_word" >&5
++echo "configure:875: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -819,7 +885,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+ break
+ done
+@@ -828,23 +894,91 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "configure:730: result: $ac_ct_CC" >&5
++  echo "configure:897: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "configure:733: result: no" >&5
++  echo "configure:900: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-    CC="$ac_ct_CC"
+-  else
+-    CC=""
+-  fi
++  CC=$ac_ct_CC
+ fi
+ 
+-  if test -z "$CC"; then
+-    # Extract the first word of "cc", so it can be a program name with args.
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++echo "configure:911: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}cc"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:933: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:936: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:945: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="cc"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:967: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:970: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "configure:744: checking for $ac_word" >&5
++echo "configure:981: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -858,7 +992,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+   ac_prog_rejected=yes
+   continue
+@@ -885,19 +1019,21 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "configure:784: result: $CC" >&5
++  echo "configure:1022: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "configure:787: result: no" >&5
++  echo "configure:1025: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-    if test -z "$CC"; then
+-      for ac_prog in cl
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "configure:795: checking for $ac_word" >&5
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "configure:1036: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -910,8 +1046,8 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_CC="$ac_prog"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ break
+ done
+ 
+@@ -919,25 +1055,65 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "configure:816: result: $CC" >&5
++  echo "configure:1058: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "configure:819: result: no" >&5
++  echo "configure:1061: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:1074: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="$ac_prog"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1096: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1099: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$CC" && break
++  test -n "$ac_ct_CC" && break
+ done
+ 
+-    fi
+-  fi
++  CC=$ac_ct_CC
++fi
++
++fi
+ 
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
+ 
+-echo "configure:827: checking whether the C compiler works" >&5
++echo "configure:1113: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<EOF
+-#line 830 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 1116 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -947,12 +1123,13 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:839: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1128: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   # FIXME: these cross compiler hacks should be removed for autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+-  if { ac_try='./conftest'; { (eval echo configure:843: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
++  if { ac_try='./conftest$ac_exeext'; { (eval echo configure:1132: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+@@ -963,179 +1140,101 @@
+     fi
+   fi
+ fi
+-echo "configure:854: result: yes" >&5
++echo "configure:1143: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  echo "configure:859: result: no" >&5
++  echo "configure:1148: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ { echo "configure: error: C compiler cannot create executables" >&2; exit 77; }
+ fi
+-rm -f conftest*echo "configure:863: checking whether we are cross compiling" >&5
++rm -f conftest$ac_exeext conftest.$ac_ext
++echo "configure:1153: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "configure:865: result: $cross_compiling" >&5
++echo "configure:1155: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "configure:867: checking whether we are using GNU C" >&5
+-echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6
+-if test "${ac_cv_prog_gcc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # The semicolon is to pacify NeXT's syntax-checking cpp.
+-cat >conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
+-#endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:878: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
+-else
+-  ac_cv_prog_gcc=no
+-fi
+-fi
+-echo "configure:884: result: $ac_cv_prog_gcc" >&5
+-echo "${ECHO_T}$ac_cv_prog_gcc" >&6
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-if test $ac_gnu_compiler = yes; then
+-  GCC=yes
+-else
+-  GCC=
+-fi
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS=
+-echo "configure:895: checking whether ${CC-cc} accepts -g" >&5
+-echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  echo 'void f(){}' >conftest.c
+-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+-  ac_cv_prog_cc_g=yes
+-else
+-  ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest*
+-
+-fi
+-echo "configure:908: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-echo "configure:925: checking for Cygwin environment" >&5
+-echo $ECHO_N "checking for Cygwin environment... $ECHO_C" >&6
+-if test "${ac_cv_cygwin+set}" = set; then
++echo "configure:1158: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 931 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1164 "configure"
+ #include "confdefs.h"
+-
+-int
+-main ()
+-{
+-#ifndef __CYGWIN__
+-# define __CYGWIN__ __CYGWIN32__
++#ifndef __GNUC__
++  choke me
+ #endif
+-return __CYGWIN__;
+-  ;
+-  return 0;
+-}
+-EOF
+-if { (eval echo configure:944: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  ac_cv_cygwin=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_cygwin=no
+-fi
+-rm -f conftest*
+-fi
+-echo "configure:953: result: $ac_cv_cygwin" >&5
+-echo "${ECHO_T}$ac_cv_cygwin" >&6
+-test "$ac_cv_cygwin" = yes && CYGWIN=yes
+-echo "configure:956: checking for mingw32 environment" >&5
+-echo $ECHO_N "checking for mingw32 environment... $ECHO_C" >&6
+-if test "${ac_cv_mingw32+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<EOF
+-#line 962 "configure"
+-#include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-return __MINGW32__;
++
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:972: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  ac_cv_mingw32=yes
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1179: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_compiler_gnu=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  ac_cv_mingw32=no
++  ac_compiler_gnu=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
+ fi
+-echo "configure:981: result: $ac_cv_mingw32" >&5
+-echo "${ECHO_T}$ac_cv_mingw32" >&6
+-test "$ac_cv_mingw32" = yes && MINGW32=yes
+-echo "configure:984: checking for EMX OS/2 environment" >&5
+-echo $ECHO_N "checking for EMX OS/2 environment... $ECHO_C" >&6
+-if test "${ac_cv_emxos2+set}" = set; then
++echo "configure:1190: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++echo "configure:1193: checking for object suffix" >&5
++echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 990 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1199 "configure"
+ #include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-return __EMX__;
++
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1000: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  ac_cv_emxos2=yes
++_ACEOF
++if { (eval echo configure:1210: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++  for ac_file in conftest.*; do
++  case $ac_file in
++    *.$ac_ext) ;;
++    *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
++  esac
++  done
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_emxos2=no
++  rm -f conftest.$ac_ext
++  { echo "configure: error: cannot compile" >&2; exit 1; }
+ fi
+-rm -f conftest*
+ fi
+-echo "configure:1009: result: $ac_cv_emxos2" >&5
+-echo "${ECHO_T}$ac_cv_emxos2" >&6
+-test "$ac_cv_emxos2" = yes && EMXOS2=yes
+-echo "configure:1012: checking for executable suffix" >&5
++echo "configure:1222: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$ac_cv_objext
++rm -f conftest.$ac_objext conftest.$ac_ext
++
++echo "configure:1228: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+ if test "${ac_cv_exeext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then
+-  ac_cv_exeext=.exe
+-else
+-  cat >conftest.$ac_ext <<EOF
+-#line 1021 "configure"
++  case "$CYGWIN $MINGW32 $EMXOS2" in
++  *yes*) ac_cv_exeext=.exe ;;
++  *)
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1237 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1145,36 +1244,42 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1030: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  for ac_file in conftest.*; do
+-     case $ac_file in
+-       *.$ac_ext | *.o | *.obj | *.xcoff) ;;
+-       *) ac_cv_exeext=`echo $ac_file | sed s/conftest//` ;;
+-     esac
+-   done
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1249: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  if test ! -f conftest; then
++    for ac_file in conftest.*; do
++       case $ac_file in
++         *.$ac_ext | *.o | *.obj | *.xcoff) ;;
++         *) ac_cv_exeext=`expr "$ac_file" : 'conftest\(.*\)'`;;
++       esac
++     done
++   fi
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   { echo "configure: error: cannot compile and link" >&2; exit 1; }
+ fi
+-rm -f conftest*
+-  test -n "$ac_cv_exeext" && ac_cv_exeext=no
+-fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++  test -n "$ac_cv_exeext" && ac_cv_exeext=no;;
++esac
+ fi
+-echo "configure:1046: result: $ac_cv_exeext" >&5
++echo "configure:1267: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ EXEEXT=
+ test "$ac_cv_exeext" != no && EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+ 
+-echo "configure:1051: checking for object suffix" >&5
+-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "configure:1276: checking whether ${CC-cc} accepts -g" >&5
++echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 1057 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1282 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1184,114 +1289,606 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1066: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  for ac_file in conftest.*; do
+-    case $ac_file in
+-      *.$ac_ext) ;;
+-      *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
+-    esac
+-  done
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1294: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_g=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  { echo "configure: error: cannot compile" >&2; exit 1; }
++  ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
++fi
++echo "configure:1303: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+-echo "configure:1080: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
+-OBJEXT=$ac_cv_objext
+-ac_objext=$ac_cv_objext
+-
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "configure:1090: checking how to run the C preprocessor" >&5
++echo "configure:1326: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-if test "${ac_cv_prog_CPP+set}" = set; then
++  if test "${ac_cv_prog_CPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  cat >conftest.$ac_ext <<EOF
+-#line 1108 "configure"
++      # Double quotes because CPP needs to be expanded
++    for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp"
++    do
++      # Use a header file that comes with gcc, so configuring glibc
++# with a fresh cross-compiler works.
++# On the NeXT, cc -E runs the code through the compiler's parser,
++# not just through cpp. "Syntax error" is here to catch this case.
++cat >conftest.$ac_ext <<_ACEOF
++#line 1349 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1114: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
++Syntax error
++_ACEOF
++ac_c_preproc_warn_flag=maybe
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1356: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat >conftest.$ac_ext <<EOF
+-#line 1124 "configure"
++  ac_cpp_err=yes
++fi
++
++# Now check whether non-existent headers can be detected and how
++# Skip if ac_cpp_err is not empty - ac_cpp is broken
++if test -z "$ac_cpp_err"; then
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1370 "configure"
++#include "confdefs.h"
++#include <ac_nonexistent.h>
++_ACEOF
++  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1375: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++  if test -z "$ac_cpp_err"; then
++    # cannot detect missing includes at all
++    ac_cpp_err=yes
++  else
++    if test "x$ac_cpp_err" = xmaybe; then
++      ac_c_preproc_warn_flag=yes
++    else
++      ac_c_preproc_warn_flag=
++    fi
++    ac_cpp_err=
++  fi
++fi
++rm -f conftest*
++
++      if test -z "$ac_cpp_err"; then
++        break
++      fi
++    done
++    ac_cv_prog_CPP=$CPP
++
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  # Use a header file that comes with gcc, so configuring glibc
++# with a fresh cross-compiler works.
++# On the NeXT, cc -E runs the code through the compiler's parser,
++# not just through cpp. "Syntax error" is here to catch this case.
++cat >conftest.$ac_ext <<_ACEOF
++#line 1413 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1130: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
++Syntax error
++_ACEOF
++ac_c_preproc_warn_flag=maybe
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1420: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++# Now check whether non-existent headers can be detected and how
++# Skip if ac_cpp_err is not empty - ac_cpp is broken
++if test -z "$ac_cpp_err"; then
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1434 "configure"
++#include "confdefs.h"
++#include <ac_nonexistent.h>
++_ACEOF
++  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1439: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++  if test -z "$ac_cpp_err"; then
++    # cannot detect missing includes at all
++    ac_cpp_err=yes
++  else
++    if test "x$ac_cpp_err" = xmaybe; then
++      ac_c_preproc_warn_flag=yes
++    else
++      ac_c_preproc_warn_flag=
++    fi
++    ac_cpp_err=
++  fi
++fi
++rm -f conftest*
++
++  ac_cv_prog_CPP=$CPP
++fi
++echo "configure:1465: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++if test -n "$ac_cpp_err"; then
++  { echo "configure: error: C preprocessor \"$CPP\" fails sanity check" >&2; exit 1; }
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++echo "configure:1485: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}gcc"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1507: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1510: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo "configure:1519: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="gcc"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1541: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1544: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++echo "configure:1555: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}cc"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1577: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1580: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:1589: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="cc"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1611: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1614: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:1625: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++  ac_prog_rejected=yes
++  continue
++fi
++ac_cv_prog_CC="cc"
++break
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    set dummy "$ac_dir/$ac_word" ${1+"$@"}
++    shift
++    ac_cv_prog_CC="$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1666: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1669: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "configure:1680: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1702: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1705: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:1718: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="$ac_prog"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1740: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1743: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
++
++echo "configure:1757: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line 1760 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1772: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  # FIXME: these cross compiler hacks should be removed for autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./conftest$ac_exeext'; { (eval echo configure:1776: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++      cross_compiling=yes
++    else
++      { echo "configure: error: cannot run C compiled programs.
++To enable cross compilation, use \`--host'." >&2; exit 1; }
++    fi
++  fi
++fi
++echo "configure:1787: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  CPP="${CC-cc} -nologo -E"
+-  cat >conftest.$ac_ext <<EOF
+-#line 1140 "configure"
++  echo "configure:1792: result: no" >&5
++echo "${ECHO_T}no" >&6
++{ echo "configure: error: C compiler cannot create executables" >&2; exit 77; }
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++echo "configure:1797: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "configure:1799: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "configure:1802: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1808 "configure"
+ #include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1146: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
++#ifndef __GNUC__
++  choke me
++#endif
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1823: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_compiler_gnu=yes
+ else
+-  echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  CPP=/lib/cpp
++  ac_compiler_gnu=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
+ fi
+-rm -f conftest*
++echo "configure:1834: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "configure:1841: checking whether ${CC-cc} accepts -g" >&5
++echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1847 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1859: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP=$CPP
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-  CPP=$ac_cv_prog_CPP
++echo "configure:1868: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
+ else
+-  ac_cv_prog_CPP=$CPP
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+-echo "configure:1167: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "configure:1169: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "configure:1891: checking for ${CC-cc} option to accept ANSI C" >&5
+ echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1308,8 +1905,8 @@
+ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  cat >conftest.$ac_ext <<EOF
+-#line 1187 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1909 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -1346,14 +1943,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1225: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1948: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_stdc=$ac_arg; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ CC=$ac_save_CC
+ 
+@@ -1361,10 +1959,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "configure:1237: result: none needed" >&5
++    echo "configure:1962: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "configure:1240: result: $ac_cv_prog_cc_stdc" >&5
++    echo "configure:1965: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -1399,11 +1997,12 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "configure:1277: checking for a BSD compatible install" >&5
++echo "configure:2005: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -1413,19 +2012,21 @@
+   for ac_dir in $PATH; do
+     # Account for people who put trailing slashes in PATH elements.
+     case $ac_dir/ in
+-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    / | ./ | .// | /cC/* \
++    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
++    | /usr/ucb/* ) ;;
+     *)
+       # OSF1 and SCO ODT 3.0 have their own names for install.
+       # Don't use installbsd from OSF since it installs stuff as root
+       # by default.
+       for ac_prog in ginstall scoinst install; do
+-        if test -f $ac_dir/$ac_prog; then
++        if test -f "$ac_dir/$ac_prog"; then
+ 	  if test $ac_prog = install &&
+-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+ 	    :
+ 	  elif test $ac_prog = install &&
+-	    grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+@@ -1450,7 +2051,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "configure:1323: result: $INSTALL" >&5
++echo "configure:2054: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -1461,7 +2062,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-echo "configure:1330: checking whether build environment is sane" >&5
++echo "configure:2065: checking whether build environment is sane" >&5
+ echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+ # Just in case
+ sleep 1
+@@ -1498,7 +2099,7 @@
+ Check your system clock" >&2; exit 1; }
+ fi
+ rm -f conftest*
+-echo "configure:1365: result: yes" >&5
++echo "configure:2102: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ if test "$program_transform_name" = s,x,x,; then
+   program_transform_name=
+@@ -1520,7 +2121,8 @@
+ test -z "$program_transform_name" && program_transform_name="s,x,x,"
+ 
+ test x"${MISSING+set}" = xset || \
+-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
++  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
++# Use eval to expand $SHELL
+ if eval "$MISSING --run :"; then
+   am_missing_run="$MISSING --run "
+ else
+@@ -1531,9 +2133,9 @@
+ 
+ for ac_prog in mawk gawk nawk awk
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1397: checking for $ac_word" >&5
++echo "configure:2138: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1546,7 +2148,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+ break
+ done
+@@ -1555,17 +2157,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "configure:1418: result: $AWK" >&5
++  echo "configure:2160: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "configure:1421: result: no" >&5
++  echo "configure:2163: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$AWK" && break
++  test -n "$AWK" && break
+ done
+ 
+-echo "configure:1426: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:2170: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -1585,11 +2187,11 @@
+ rm -f conftestmake
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "configure:1446: result: yes" >&5
++  echo "configure:2190: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "configure:1450: result: no" >&5
++  echo "configure:2194: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1598,7 +2200,7 @@
+ if test "${enable_dependency_tracking+set}" = set; then
+   enableval="$enable_dependency_tracking"
+ 
+-fi
++fi;
+ if test "x$enable_dependency_tracking" = xno; then
+   AMDEP="#"
+ else
+@@ -1625,7 +2227,7 @@
+ ac_config_commands="$ac_config_commands default-2"
+ 
+ # test to see if srcdir already configured
+-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
++if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   { echo "configure: error: source directory already configured; run \"make distclean\" there first" >&2; exit 1; }
+ fi
+@@ -1663,9 +2265,12 @@
+          install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
+ fi
+ 
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++
+ depcc="$CC"
+ depcpp="$CPP"
+-echo "configure:1508: checking dependency style of $depcc" >&5
++echo "configure:2273: checking dependency style of $depcc" >&5
+ echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1689,10 +2294,13 @@
+       ;;
+     none) break ;;
+     esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
+     if depmode="$depmode" \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
++       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
+        grep conftest.h conftest.Po > /dev/null 2>&1; then
+       am_cv_CC_dependencies_compiler_type="$depmode"
+       break
+@@ -1706,7 +2314,7 @@
+ 
+ fi
+ 
+-echo "configure:1544: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "configure:2317: result: $am_cv_CC_dependencies_compiler_type" >&5
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
+ 
+@@ -1714,7 +2322,7 @@
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+   { echo "configure: error: cannot run $ac_config_sub" >&2; exit 1; }
+ 
+-echo "configure:1550: checking build system type" >&5
++echo "configure:2325: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1727,14 +2335,14 @@
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1
+ 
+ fi
+-echo "configure:1562: result: $ac_cv_build" >&5
++echo "configure:2338: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "configure:1568: checking host system type" >&5
++echo "configure:2345: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1745,7 +2353,7 @@
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1
+ 
+ fi
+-echo "configure:1578: result: $ac_cv_host" >&5
++echo "configure:2356: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1791,9 +2399,9 @@
+ 
+ for ac_prog in 'bison -y' byacc
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1620: checking for $ac_word" >&5
++echo "configure:2404: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_YACC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1806,7 +2414,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_YACC="$ac_prog"
+ break
+ done
+@@ -1815,22 +2423,22 @@
+ fi
+ YACC=$ac_cv_prog_YACC
+ if test -n "$YACC"; then
+-  echo "configure:1641: result: $YACC" >&5
++  echo "configure:2426: result: $YACC" >&5
+ echo "${ECHO_T}$YACC" >&6
+ else
+-  echo "configure:1644: result: no" >&5
++  echo "configure:2429: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$YACC" && break
++  test -n "$YACC" && break
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
+ for ac_prog in flex lex
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1654: checking for $ac_word" >&5
++echo "configure:2441: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LEX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1843,7 +2451,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LEX="$ac_prog"
+ break
+ done
+@@ -1852,20 +2460,22 @@
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  echo "configure:1675: result: $LEX" >&5
++  echo "configure:2463: result: $LEX" >&5
+ echo "${ECHO_T}$LEX" >&6
+ else
+-  echo "configure:1678: result: no" >&5
++  echo "configure:2466: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$LEX" && break
++  test -n "$LEX" && break
+ done
+ test -n "$LEX" || LEX="${am_missing_run}flex"
+ 
+-# Extract the first word of "flex", so it can be a program name with args.
+-set dummy flex; ac_word=$2
+-echo "configure:1686: checking for $ac_word" >&5
++for ac_prog in flex lex
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2478: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LEX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1878,44 +2488,38 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_LEX="flex"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_LEX="$ac_prog"
+ break
+ done
+ 
+-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+ fi
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  echo "configure:1708: result: $LEX" >&5
++  echo "configure:2500: result: $LEX" >&5
+ echo "${ECHO_T}$LEX" >&6
+ else
+-  echo "configure:1711: result: no" >&5
++  echo "configure:2503: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
+ if test -z "$LEXLIB"
+ then
+-  case $LEX in
+-  flex*) ac_lib=fl ;;
+-  *) ac_lib=l ;;
+-  esac
+ 
+-ac_ac_Lib=`echo "ac_cv_lib_$ac_lib_yywrap" | $ac_tr_sh`
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:1725: checking for yywrap in -l$ac_lib" >&5
+-echo $ECHO_N "checking for yywrap in -l$ac_lib... $ECHO_C" >&6
+-if eval "test \"\${$ac_ac_Lib+set}\" = set"; then
++echo "configure:2514: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$ac_lib  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 1733 "configure"
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2522 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1932,26 +2536,73 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1750: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  eval "$ac_ac_Lib=yes"
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2541: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_fl_yywrap=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  eval "$ac_ac_Lib=no"
++  ac_cv_lib_fl_yywrap=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:1760: result: `eval echo '${'$ac_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6
+-if test `eval echo '${'$ac_ac_Lib'}'` = yes; then
+-  LEXLIB="-l$ac_lib"
++echo "configure:2551: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
++if test $ac_cv_lib_fl_yywrap = yes; then
++  LEXLIB="-lfl"
++else
++
++echo "configure:2557: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2565 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2584: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_l_yywrap=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_l_yywrap=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:2594: result: $ac_cv_lib_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
++if test $ac_cv_lib_l_yywrap = yes; then
++  LEXLIB="-ll"
+ fi
+ 
+ fi
+ 
+-echo "configure:1766: checking lex output file root" >&5
++fi
++
++if test "x$LEX" != "x:"; then
++  echo "configure:2605: checking lex output file root" >&5
+ echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+ if test "${ac_cv_prog_lex_root+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1968,11 +2619,11 @@
+   { echo "configure: error: cannot find output from $LEX; giving up" >&2; exit 1; }
+ fi
+ fi
+-echo "configure:1783: result: $ac_cv_prog_lex_root" >&5
++echo "configure:2622: result: $ac_cv_prog_lex_root" >&5
+ echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+ 
+-echo "configure:1786: checking whether yytext is a pointer" >&5
++echo "configure:2626: checking whether yytext is a pointer" >&5
+ echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
+ if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1984,67 +2635,108 @@
+ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+ ac_save_LIBS=$LIBS
+ LIBS="$LIBS $LEXLIB"
+-cat >conftest.$ac_ext <<EOF
++cat >conftest.$ac_ext <<_ACEOF
+ `cat $LEX_OUTPUT_ROOT.c`
+-EOF
+-if { (eval echo configure:1801: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2642: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_prog_lex_yytext_pointer=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_save_LIBS
+ rm -f "${LEX_OUTPUT_ROOT}.c"
+ 
+ fi
+-echo "configure:1811: result: $ac_cv_prog_lex_yytext_pointer" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+-if test $ac_cv_prog_lex_yytext_pointer = yes; then
+-
+-cat >>confdefs.h <<\EOF
+-#define YYTEXT_POINTER 1
+-EOF
++echo "configure:2653: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
++
++cat >>confdefs.h <<\EOF
++#define YYTEXT_POINTER 1
++EOF
++
++fi
++
++fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo "configure:2668: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++break
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "configure:2690: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "configure:2693: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ 
+ fi
+-
+-# Extract the first word of "ranlib", so it can be a program name with args.
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "configure:1820: checking for $ac_word" >&5
++echo "configure:2702: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+   ac_save_IFS=$IFS; IFS=':'
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_RANLIB="ranlib"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_RANLIB="ranlib"
+ break
+ done
+ 
+-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "configure:1842: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "configure:2725: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "configure:1845: result: no" >&5
++  echo "configure:2728: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++  RANLIB=$ac_ct_RANLIB
++fi
++
+ for ac_prog in mawk gawk nawk awk
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1852: checking for $ac_word" >&5
++echo "configure:2739: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2057,7 +2749,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+ break
+ done
+@@ -2066,17 +2758,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "configure:1873: result: $AWK" >&5
++  echo "configure:2761: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "configure:1876: result: no" >&5
++  echo "configure:2764: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$AWK" && break
++  test -n "$AWK" && break
+ done
+ 
+-echo "configure:1881: checking for ln -s or something else" >&5
++echo "configure:2771: checking for ln -s or something else" >&5
+ echo $ECHO_N "checking for ln -s or something else... $ECHO_C" >&6
+ if test "${ac_cv_prog_LN_S+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2097,14 +2789,14 @@
+ fi
+ fi
+ LN_S="$ac_cv_prog_LN_S"
+-echo "configure:1902: result: $ac_cv_prog_LN_S" >&5
++echo "configure:2792: result: $ac_cv_prog_LN_S" >&5
+ echo "${ECHO_T}$ac_cv_prog_LN_S" >&6
+ 
+ # Check whether --with-mips_abi or --without-mips_abi was given.
+ if test "${with_mips_abi+set}" = set; then
+   withval="$with_mips_abi"
+ 
+-fi
++fi;
+ 
+ case "$host_os" in
+ irix*)
+@@ -2129,7 +2821,7 @@
+ esac
+ if test -n "$abi" ; then
+ ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
+-echo "configure:1929: checking if $CC supports the $abi option" >&5
++echo "configure:2824: checking if $CC supports the $abi option" >&5
+ echo $ECHO_N "checking if $CC supports the $abi option... $ECHO_C" >&6
+ if eval "test \"\${$ac_foo+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2137,8 +2829,8 @@
+ 
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $abi"
+-cat >conftest.$ac_ext <<EOF
+-#line 1937 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2833 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2148,21 +2840,22 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1947: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2845: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval $ac_foo=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval $ac_foo=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+ 
+ fi
+ 
+ ac_res=`eval echo \\\$$ac_foo`
+-echo "configure:1958: result: $ac_res" >&5
++echo "configure:2858: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6
+ if test $ac_res = no; then
+ # Try to figure out why that failed...
+@@ -2170,8 +2863,8 @@
+ 	-mabi=32)
+ 	save_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS -mabi=n32"
+-	cat >conftest.$ac_ext <<EOF
+-#line 1967 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 2867 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2181,15 +2874,16 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1977: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2879: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_res=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_res=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CLAGS="$save_CFLAGS"
+ 	if test $ac_res = yes; then
+ 		# New GCC
+@@ -2227,14 +2921,14 @@
+ CC="$CC $abi"
+ libdir="$libdir$abilibdirext"
+ 
+-echo "configure:2020: checking for __attribute__" >&5
++echo "configure:2924: checking for __attribute__" >&5
+ echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
+ if test "${ac_cv___attribute__+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 2026 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2931 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -2254,15 +2948,16 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2042: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2953: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv___attribute__=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv___attribute__=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ if test "$ac_cv___attribute__" = "yes"; then
+@@ -2272,7 +2967,7 @@
+ EOF
+ 
+ fi
+-echo "configure:2056: result: $ac_cv___attribute__" >&5
++echo "configure:2970: result: $ac_cv___attribute__" >&5
+ echo "${ECHO_T}$ac_cv___attribute__" >&6
+ 
+ # Check whether --enable-shared or --disable-shared was given.
+@@ -2296,7 +2991,7 @@
+ esac
+ else
+   enable_shared=no
+-fi
++fi;
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+   enableval="$enable_static"
+@@ -2318,7 +3013,7 @@
+ esac
+ else
+   enable_static=yes
+-fi
++fi;
+ # Check whether --enable-fast-install or --disable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+   enableval="$enable_fast_install"
+@@ -2340,26 +3035,21 @@
+ esac
+ else
+   enable_fast_install=yes
+-fi
++fi;
++
+ # Check whether --with-gnu-ld or --without-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+   withval="$with_gnu_ld"
+   test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+-fi
++fi;
+ ac_prog=ld
+-if test "$ac_cv_prog_gcc" = yes; then
++if test "$ac_cv_c_compiler_gnu" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "configure:2134: checking for ld used by GCC" >&5
++  echo "configure:3050: checking for ld used by GCC" >&5
+ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
++  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+   case "$ac_prog" in
+     # Accept absolute paths.
+     [\\/]* | [A-Za-z]:[\\/]*)
+@@ -2381,10 +3071,10 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "configure:2164: checking for GNU ld" >&5
++  echo "configure:3074: checking for GNU ld" >&5
+ echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+ else
+-  echo "configure:2167: checking for non-GNU ld" >&5
++  echo "configure:3077: checking for non-GNU ld" >&5
+ echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ fi
+ if test "${ac_cv_path_LD+set}" = set; then
+@@ -2414,14 +3104,14 @@
+ 
+ LD="$ac_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "configure:2196: result: $LD" >&5
++  echo "configure:3107: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "configure:2199: result: no" >&5
++  echo "configure:3110: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" >&2; exit 1; }
+-echo "configure:2203: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:3114: checking if the linker ($LD) is GNU ld" >&5
+ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2433,23 +3123,10 @@
+   ac_cv_prog_gnu_ld=no
+ fi
+ fi
+-echo "configure:2215: result: $ac_cv_prog_gnu_ld" >&5
++echo "configure:3126: result: $ac_cv_prog_gnu_ld" >&5
+ echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6
+-with_gnu_ld=$ac_cv_prog_gnu_ld
+-
+-echo "configure:2218: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+-if test "${lt_cv_ld_reload_flag+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_ld_reload_flag='-r'
+-fi
+-echo "configure:2225: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
+ 
+-echo "configure:2229: checking for BSD-compatible nm" >&5
++echo "configure:3129: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+ if test "${ac_cv_path_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2460,510 +3137,86 @@
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -B"
+-	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -p"
+-	break
+-      else
+-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+-fi
+-fi
+-
+-NM="$ac_cv_path_NM"
+-echo "configure:2263: result: $NM" >&5
+-echo "${ECHO_T}$NM" >&6
+-
+-echo "configure:2265: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+-if test "${ac_cv_prog_LN_S+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  rm -f conftest.sym conftest.file
+-echo >conftest.file
+-if ln -s conftest.file conftest.sym 2>/dev/null; then
+-  ac_cv_prog_LN_S="ln -s"
+-else
+-  ac_cv_prog_LN_S=ln
+-fi
+-fi
+-LN_S=$ac_cv_prog_LN_S
+-if test "$ac_cv_prog_LN_S" = "ln -s"; then
+-  echo "configure:2280: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "configure:2283: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-echo "configure:2286: checking how to recognise dependant libraries" >&5
+-echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_file_magic_cmd='${MAGIC}'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [regex]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
+-
+-case "$host_os" in
+-aix4*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-bsdi4*)
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+-
+-cygwin* | mingw*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+-  ;;
+-
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case "$host_cpu" in
+-    i*86 )
+-            lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
+-            lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20*)
+-  # TODO:  Does this work for hpux-11 too?
+-  lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
+-
+-irix5* | irix6*)
+-  case "$host_os" in
+-  irix5*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case "$LD" in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-        lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-        ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux-gnu*)
+-  case "$host_cpu" in
+-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-      esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  ;;
+-
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+-  else
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-        lt_cv_file_magic_cmd='/usr/bin/file -L'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-  fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case "$host_vendor" in
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  motorola)
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  esac
+-  ;;
+-esac
+-
+-fi
+-echo "configure:2407: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-
+-# Only perform the check for file, if the check method requires it
+-case "$deplibs_check_method" in
+-file_magic*)
+-  if test "$file_magic_cmd" = '${MAGIC}'; then
+-    echo "configure:2415: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/${ac_tool_prefix}file; then
+-      lt_cv_path_MAGIC="$ac_dir/${ac_tool_prefix}file"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac
+-fi
+-
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  echo "configure:2467: result: $MAGIC" >&5
+-echo "${ECHO_T}$MAGIC" >&6
+-else
+-  echo "configure:2470: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -z "$lt_cv_path_MAGIC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    echo "configure:2475: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/file; then
+-      lt_cv_path_MAGIC="$ac_dir/file"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac
+-fi
+-
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  echo "configure:2527: result: $MAGIC" >&5
+-echo "${ECHO_T}$MAGIC" >&6
+-else
+-  echo "configure:2530: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  else
+-    MAGIC=:
+-  fi
+-fi
+-
+-  fi
+-  ;;
+-esac
+-
+-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "configure:2542: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-break
+-done
+-
+-fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "configure:2563: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
+-else
+-  echo "configure:2566: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -z "$ac_cv_prog_RANLIB"; then
+-  if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo "configure:2573: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_RANLIB"; then
+-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_ac_ct_RANLIB="ranlib"
+-break
+-done
+-
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  echo "configure:2595: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+-  echo "configure:2598: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-    RANLIB="$ac_ct_RANLIB"
+-  else
+-    RANLIB=":"
+-  fi
+-fi
+-
+-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "configure:2608: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-break
+-done
+-
+-fi
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -B"
++	break
++      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -p"
++	break
++      else
++	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
++	continue # so that we can try to find one that supports BSD flags
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+ fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  echo "configure:2629: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
+-else
+-  echo "configure:2632: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ fi
+ 
+-if test -z "$ac_cv_prog_STRIP"; then
+-  if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-echo "configure:2639: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++NM="$ac_cv_path_NM"
++echo "configure:3163: result: $NM" >&5
++echo "${ECHO_T}$NM" >&6
++
++echo "configure:3166: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++if test "${ac_cv_prog_LN_S+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++  rm -f conftest.sym conftest.file
++echo >conftest.file
++if ln -s conftest.file conftest.sym 2>/dev/null; then
++  ac_cv_prog_LN_S="ln -s"
++elif ln conftest.file conftest.sym 2>/dev/null; then
++  ac_cv_prog_LN_S=ln
+ else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_ac_ct_STRIP="strip"
+-break
+-done
+-
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++  ac_cv_prog_LN_S=cp
+ fi
++rm -f conftest.sym conftest.file
+ fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  echo "configure:2661: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++LN_S=$ac_cv_prog_LN_S
++
++if test "$ac_cv_prog_LN_S" = "ln -s"; then
++  echo "configure:3185: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "configure:2664: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "configure:3188: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-    STRIP="$ac_ct_STRIP"
+-  else
+-    STRIP=":"
+-  fi
+-fi
++case "$target" in
++NONE) lt_target="$host" ;;
++*) lt_target="$target" ;;
++esac
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+ test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
++test "$ac_cv_c_compiler_gnu" = yes && libtool_flags="$libtool_flags --with-gcc"
+ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ 
+ # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+   enableval="$enable_libtool_lock"
+ 
+-fi
++fi;
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+ 
+-# Check whether --with-pic or --without-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
+-else
+-  pic_mode=default
+-fi
+-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
+-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+-
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+-case "$host" in
++case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 2699 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:2700: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++  echo '#line 3218 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:3219: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       LD="${LD-ld} -32"
+@@ -2983,21 +3236,13 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  echo "configure:2719: checking whether the C compiler needs -belf" >&5
++  echo "configure:3239: checking whether the C compiler needs -belf" >&5
+ echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-
+-     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-
+-     cat >conftest.$ac_ext <<EOF
+-#line 2731 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3245 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3007,24 +3252,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2740: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3257: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lt_cv_cc_needs_belf=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   lt_cv_cc_needs_belf=no
+ fi
+-rm -f conftest*
+-     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:2755: result: $lt_cv_cc_needs_belf" >&5
++echo "configure:3266: result: $lt_cv_cc_needs_belf" >&5
+ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+@@ -3038,18 +3277,17 @@
+ cat >confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+-# scripts and configure runs.  It is not useful on other systems.
+-# If it contains results you don't want to keep, you may remove or edit it.
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
+ #
+-# By default, configure uses `config.cache' as the cache file,
+-# creating it if it does not exist already.  You can give configure
+-# the --cache-file=FILE option to use a different cache file; that is
+-# what configure does when it calls configure scripts in
+-# subdirectories, so they share the cache.
+-# Giving --cache-file=/dev/null disables caching, for debugging configure.
+-# config.status only pays attention to the cache file if you give it the
+-# --recheck option to rerun configure.
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
+ #
++# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
+ EOF
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+@@ -3072,7 +3310,7 @@
+       ;;
+     esac;
+ } |
+-  sed 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
++  sed '/^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
+ if cmp -s $cache_file confcache; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+@@ -3084,14 +3322,12 @@
+ rm -f confcache
+ 
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" >&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -3134,6 +3370,7 @@
+ fi
+ 
+ berkeley_db=db
++
+ # Check whether --with-berkeley-db or --without-berkeley-db was given.
+ if test "${with_berkeley_db+set}" = set; then
+   withval="$with_berkeley_db"
+@@ -3142,7 +3379,7 @@
+ 	berkeley_db=""
+ fi
+ 
+-fi
++fi;
+ if test "$berkeley_db"; then
+ 
+ for ac_header in 				\
+@@ -3151,35 +3388,41 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:2873: checking for $ac_header" >&5
++
++echo "configure:3392: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 2879 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3398 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2884: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:3404: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:2896: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:3425: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3191,7 +3434,7 @@
+ 
+ fi
+ 
+-echo "configure:2905: checking for dbopen" >&5
++echo "configure:3437: checking for dbopen" >&5
+ echo $ECHO_N "checking for dbopen... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dbopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3206,8 +3449,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 2920 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 3453 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -3224,14 +3467,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2936: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3472: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbopen=$ac_lib; else ac_cv_funclib_dbopen=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dbopen=\${ac_cv_funclib_dbopen-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -3246,13 +3490,13 @@
+ for ac_func in dbopen
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:2954: checking for $ac_func" >&5
++echo "configure:3493: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 2960 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3499 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3281,17 +3525,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2988: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3530: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:2997: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:3539: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3315,13 +3560,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:3017: result: yes" >&5
++	echo "configure:3563: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dbopen=no"
+ 	eval "LIB_dbopen="
+-	echo "configure:3023: result: no" >&5
++	echo "configure:3569: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -3335,12 +3580,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:3035: result: yes, in $ac_res" >&5
++	echo "configure:3583: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:3039: checking for dbm_firstkey" >&5
++echo "configure:3588: checking for dbm_firstkey" >&5
+ echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3355,8 +3600,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 3054 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 3604 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3366,14 +3611,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3064: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3616: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -3388,13 +3634,13 @@
+ for ac_func in dbm_firstkey
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:3082: checking for $ac_func" >&5
++echo "configure:3637: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3088 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3643 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3423,17 +3669,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3116: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3674: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:3125: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:3683: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3457,13 +3704,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:3145: result: yes" >&5
++	echo "configure:3707: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dbm_firstkey=no"
+ 	eval "LIB_dbm_firstkey="
+-	echo "configure:3151: result: no" >&5
++	echo "configure:3713: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -3477,12 +3724,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:3163: result: yes, in $ac_res" >&5
++	echo "configure:3727: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:3167: checking for db_create" >&5
++echo "configure:3732: checking for db_create" >&5
+ echo $ECHO_N "checking for db_create... $ECHO_C" >&6
+ if test "${ac_cv_funclib_db_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3497,8 +3744,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 3182 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 3748 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3508,14 +3755,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3192: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3760: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_db_create=$ac_lib; else ac_cv_funclib_db_create=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_db_create=\${ac_cv_funclib_db_create-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -3530,13 +3778,13 @@
+ for ac_func in db_create
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:3210: checking for $ac_func" >&5
++echo "configure:3781: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3216 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3787 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3565,17 +3813,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3244: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3818: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:3253: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:3827: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3599,13 +3848,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:3273: result: yes" >&5
++	echo "configure:3851: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_db_create=no"
+ 	eval "LIB_db_create="
+-	echo "configure:3279: result: no" >&5
++	echo "configure:3857: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -3619,7 +3868,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:3291: result: yes, in $ac_res" >&5
++	echo "configure:3871: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -3632,32 +3881,33 @@
+ 	DBLIB="$DBLIB $LIB_dbm_firstkey"
+ fi
+ 
+-echo "configure:3302: checking for inline" >&5
++echo "configure:3884: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<EOF
+-#line 3310 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3892 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ $ac_kw int foo () {return 0; }
+ #endif
+ 
+-EOF
+-if { (eval echo configure:3316: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3900: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+-echo "configure:3325: result: $ac_cv_c_inline" >&5
++echo "configure:3910: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -3672,13 +3922,13 @@
+  ;;
+ esac
+ 
+-echo "configure:3339: checking for an ANSI C-conforming const" >&5
++echo "configure:3925: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3345 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3931 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3734,17 +3984,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3399: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3989: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_c_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3408: result: $ac_cv_c_const" >&5
++echo "configure:3998: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -3754,27 +4005,35 @@
+ 
+ fi
+ 
+-echo "configure:3415: checking for ANSI C header files" >&5
++echo "configure:4008: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3421 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4014 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3429: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4023: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+@@ -3783,12 +4042,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 3443 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4046 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "memchr" >/dev/null 2>&1; then
+   :
+@@ -3801,12 +4060,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 3458 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4064 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "free" >/dev/null 2>&1; then
+   :
+@@ -3822,8 +4081,8 @@
+   if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3476 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4085 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -3847,21 +4106,22 @@
+       exit(2);
+   exit (0);
+ }
+-EOF
+-if { (eval echo configure:3500: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:4111: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+ fi
+-echo "configure:3512: result: $ac_cv_header_stdc" >&5
++echo "configure:4124: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -3871,13 +4131,13 @@
+ 
+ fi
+ 
+-echo "configure:3519: checking for size_t" >&5
++echo "configure:4134: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3525 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4140 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -3890,17 +4150,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3539: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4155: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_size_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3548: result: $ac_cv_type_size_t" >&5
++echo "configure:4164: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -3912,13 +4173,13 @@
+ 
+ fi
+ 
+-echo "configure:3557: checking for pid_t" >&5
++echo "configure:4176: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3563 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4182 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -3931,17 +4192,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3577: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4197: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_pid_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3586: result: $ac_cv_type_pid_t" >&5
++echo "configure:4206: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -3953,17 +4215,17 @@
+ 
+ fi
+ 
+-echo "configure:3595: checking for uid_t in sys/types.h" >&5
++echo "configure:4218: checking for uid_t in sys/types.h" >&5
+ echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3601 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4224 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "uid_t" >/dev/null 2>&1; then
+   ac_cv_type_uid_t=yes
+@@ -3973,7 +4235,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:3613: result: $ac_cv_type_uid_t" >&5
++echo "configure:4238: result: $ac_cv_type_uid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+ if test $ac_cv_type_uid_t = no; then
+ 
+@@ -3987,13 +4249,13 @@
+ 
+ fi
+ 
+-echo "configure:3623: checking return type of signal handlers" >&5
++echo "configure:4252: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3629 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4258 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -4013,17 +4275,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3649: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4280: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=void
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_signal=int
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3658: result: $ac_cv_type_signal" >&5
++echo "configure:4289: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -4038,13 +4301,13 @@
+ 
+ fi
+ 
+-echo "configure:3669: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:4304: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3675 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4310 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -4057,17 +4320,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3688: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4325: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_time=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3697: result: $ac_cv_header_time" >&5
++echo "configure:4334: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -4080,35 +4344,41 @@
+ for ac_header in standards.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:3711: checking for $ac_header" >&5
++
++echo "configure:4348: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3717 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4354 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3722: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4360: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:3734: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:4381: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4122,13 +4392,13 @@
+ 
+ cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-echo "configure:3744: checking for $i" >&5
++echo "configure:4395: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3750 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4401 "configure"
+ #include "confdefs.h"
+ \
+ #ifdef HAVE_STANDARDS_H
+@@ -4136,21 +4406,30 @@
+ #endif
+ #include <$i>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3759: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4411: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "ac_cv_header_$cv=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_header_$cv=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:3771: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "configure:4432: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
+ ac_res=`eval echo \\$ac_cv_header_$cv`
+ if test "$ac_res" = yes; then
+@@ -4167,35 +4446,41 @@
+ for ac_header in netinet/ip.h netinet/tcp.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:3790: checking for $ac_header" >&5
++
++echo "configure:4450: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3796 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4456 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3801: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4462: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:3813: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:4483: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4210,13 +4495,13 @@
+ for ac_func in getlogin setlogin
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:3825: checking for $ac_func" >&5
++echo "configure:4498: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3831 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4504 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4245,17 +4530,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3859: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:4535: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:3868: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:4544: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4266,7 +4552,7 @@
+ done
+ 
+ if test "$ac_cv_func_getlogin" = yes; then
+-echo "configure:3877: checking if getlogin is posix" >&5
++echo "configure:4555: checking if getlogin is posix" >&5
+ echo $ECHO_N "checking if getlogin is posix... $ECHO_C" >&6
+ if test "${ac_cv_func_getlogin_posix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4279,7 +4565,7 @@
+ fi
+ 
+ fi
+-echo "configure:3888: result: $ac_cv_func_getlogin_posix" >&5
++echo "configure:4568: result: $ac_cv_func_getlogin_posix" >&5
+ echo "${ECHO_T}$ac_cv_func_getlogin_posix" >&6
+ if test "$ac_cv_func_getlogin_posix" = yes; then
+ 	
+@@ -4290,7 +4576,7 @@
+ fi
+ fi
+ 
+-echo "configure:3897: checking if realloc if broken" >&5
++echo "configure:4579: checking if realloc if broken" >&5
+ echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
+ if test "${ac_cv_func_realloc_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4300,8 +4586,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3907 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4590 "configure"
+ #include "confdefs.h"
+ 
+ #include <stddef.h>
+@@ -4312,20 +4598,21 @@
+ 	return realloc(NULL, 17) == NULL;
+ }
+ 
+-EOF
+-if { (eval echo configure:3916: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:4603: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_realloc_broken=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:3927: result: $ac_cv_func_realloc_broken" >&5
++echo "configure:4615: result: $ac_cv_func_realloc_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
+ if test "$ac_cv_func_realloc_broken" = yes ; then
+ 	
+@@ -4352,13 +4639,13 @@
+   WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
+ fi
+ 
+-echo "configure:3950: checking for ssize_t" >&5
++echo "configure:4642: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3956 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4648 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4366,7 +4653,7 @@
+ #include <stddef.h>
+ #endif
+ #include <unistd.h>
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_ssize_t=yes
+@@ -4376,7 +4663,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:3973: result: $ac_cv_type_ssize_t" >&5
++echo "configure:4666: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = no; then
+ 
+@@ -4387,13 +4674,13 @@
+ fi
+ 
+ cv=`echo "long long" | sed 'y%./+- %__p__%'`
+-echo "configure:3981: checking for long long" >&5
++echo "configure:4677: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3987 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4683 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4408,29 +4695,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4002: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4700: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:4012: result: $ac_foo" >&5
++echo "configure:4710: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:4017: checking for long long" >&5
++	echo "configure:4715: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4023 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4721 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4443,17 +4731,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4037: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4736: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_long_long=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_long_long=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:4046: result: $ac_cv_type_long_long" >&5
++echo "configure:4745: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+ 
+@@ -4519,35 +4808,41 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:4109: checking for $ac_header" >&5
++
++echo "configure:4812: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4115 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4818 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4120: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4824: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:4132: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:4845: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4582,27 +4877,27 @@
+ if test "$withval" = "no"; then
+ 	ac_cv_lib_ipv6=no
+ fi
+-fi
++fi;
+ if test "${ac_cv_lib_ipv6+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   v6type=unknown
+ v6lib=none
+ 
+-echo "configure:4167: checking ipv6 stack type" >&5
++echo "configure:4887: checking ipv6 stack type" >&5
+ echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
+ for i in v6d toshiba kame inria zeta linux; do
+ 	case $i in
+ 	v6d)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4173 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4893 "configure"
+ #include "confdefs.h"
+ dnl
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=v6;
+@@ -4613,15 +4908,15 @@
+ 
+ 		;;
+ 	toshiba)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4191 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4912 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -4632,15 +4927,15 @@
+ 
+ 		;;
+ 	kame)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4209 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4931 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -4651,15 +4946,15 @@
+ 
+ 		;;
+ 	inria)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4227 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4950 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; CFLAGS="-DINET6 $CFLAGS"
+@@ -4668,15 +4963,15 @@
+ 
+ 		;;
+ 	zeta)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4243 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4967 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -4699,7 +4994,7 @@
+ 		break
+ 	fi
+ done
+-echo "configure:4272: result: $v6type" >&5
++echo "configure:4997: result: $v6type" >&5
+ echo "${ECHO_T}$v6type" >&6
+ 
+ if test "$v6lib" != "none"; then
+@@ -4710,8 +5005,8 @@
+ 		fi
+ 	done
+ fi
+-cat >conftest.$ac_ext <<EOF
+-#line 4283 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 5009 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -4744,20 +5039,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4311: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5044: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipv6=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ipv6=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "configure:4320: checking for IPv6" >&5
++echo "configure:5054: checking for IPv6" >&5
+ echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
+-echo "configure:4322: result: $ac_cv_lib_ipv6" >&5
++echo "configure:5056: result: $ac_cv_lib_ipv6" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 
+@@ -4767,7 +5063,7 @@
+ 
+ fi
+ 
+-echo "configure:4329: checking for socket" >&5
++echo "configure:5066: checking for socket" >&5
+ echo $ECHO_N "checking for socket... $ECHO_C" >&6
+ if test "${ac_cv_funclib_socket+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4782,8 +5078,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4344 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5082 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4793,14 +5089,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4354: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5094: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -4815,13 +5112,13 @@
+ for ac_func in socket
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4372: checking for $ac_func" >&5
++echo "configure:5115: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4378 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5121 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4850,17 +5147,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4406: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5152: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4415: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5161: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4884,13 +5182,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4435: result: yes" >&5
++	echo "configure:5185: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_socket=no"
+ 	eval "LIB_socket="
+-	echo "configure:4441: result: no" >&5
++	echo "configure:5191: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -4904,7 +5202,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4453: result: yes, in $ac_res" >&5
++	echo "configure:5205: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -4913,7 +5211,7 @@
+ 	LIBS="$LIB_socket $LIBS"
+ fi
+ 
+-echo "configure:4460: checking for gethostbyname" >&5
++echo "configure:5214: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4928,8 +5226,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4475 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5230 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4939,14 +5237,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4485: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5242: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -4961,13 +5260,13 @@
+ for ac_func in gethostbyname
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4503: checking for $ac_func" >&5
++echo "configure:5263: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4509 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5269 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4996,17 +5295,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4537: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5300: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4546: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5309: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5030,13 +5330,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4566: result: yes" >&5
++	echo "configure:5333: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname=no"
+ 	eval "LIB_gethostbyname="
+-	echo "configure:4572: result: no" >&5
++	echo "configure:5339: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5050,7 +5350,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4584: result: yes, in $ac_res" >&5
++	echo "configure:5353: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5059,7 +5359,7 @@
+ 	LIBS="$LIB_gethostbyname $LIBS"
+ fi
+ 
+-echo "configure:4591: checking for syslog" >&5
++echo "configure:5362: checking for syslog" >&5
+ echo $ECHO_N "checking for syslog... $ECHO_C" >&6
+ if test "${ac_cv_funclib_syslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5074,8 +5374,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4606 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5378 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5085,14 +5385,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4616: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5390: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5107,13 +5408,13 @@
+ for ac_func in syslog
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4634: checking for $ac_func" >&5
++echo "configure:5411: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4640 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5417 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5142,17 +5443,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4668: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5448: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4677: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5457: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5176,13 +5478,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4697: result: yes" >&5
++	echo "configure:5481: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_syslog=no"
+ 	eval "LIB_syslog="
+-	echo "configure:4703: result: no" >&5
++	echo "configure:5487: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5196,7 +5498,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4715: result: yes, in $ac_res" >&5
++	echo "configure:5501: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5205,7 +5507,7 @@
+ 	LIBS="$LIB_syslog $LIBS"
+ fi
+ 
+-echo "configure:4722: checking for gethostbyname2" >&5
++echo "configure:5510: checking for gethostbyname2" >&5
+ echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5220,8 +5522,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4737 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5526 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5231,14 +5533,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4747: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5538: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5253,13 +5556,13 @@
+ for ac_func in gethostbyname2
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4765: checking for $ac_func" >&5
++echo "configure:5559: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4771 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5565 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5288,17 +5591,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4799: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5596: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4808: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5605: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5322,13 +5626,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4828: result: yes" >&5
++	echo "configure:5629: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname2=no"
+ 	eval "LIB_gethostbyname2="
+-	echo "configure:4834: result: no" >&5
++	echo "configure:5635: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5342,7 +5646,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4846: result: yes, in $ac_res" >&5
++	echo "configure:5649: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5351,7 +5655,7 @@
+ 	LIBS="$LIB_gethostbyname2 $LIBS"
+ fi
+ 
+-echo "configure:4853: checking for res_search" >&5
++echo "configure:5658: checking for res_search" >&5
+ echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+ if test "${ac_cv_funclib_res_search+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5366,8 +5670,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4868 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5674 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5391,14 +5695,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4891: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5700: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5413,13 +5718,13 @@
+ for ac_func in res_search
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4909: checking for $ac_func" >&5
++echo "configure:5721: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4915 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5727 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5448,17 +5753,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4943: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5758: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4952: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5767: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5482,13 +5788,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4972: result: yes" >&5
++	echo "configure:5791: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_search=no"
+ 	eval "LIB_res_search="
+-	echo "configure:4978: result: no" >&5
++	echo "configure:5797: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5502,7 +5808,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4990: result: yes, in $ac_res" >&5
++	echo "configure:5811: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5511,7 +5817,7 @@
+ 	LIBS="$LIB_res_search $LIBS"
+ fi
+ 
+-echo "configure:4997: checking for dn_expand" >&5
++echo "configure:5820: checking for dn_expand" >&5
+ echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5526,8 +5832,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5012 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5836 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5551,14 +5857,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5035: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5862: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5573,13 +5880,13 @@
+ for ac_func in dn_expand
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5053: checking for $ac_func" >&5
++echo "configure:5883: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5059 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5889 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5608,17 +5915,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5087: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5920: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5096: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5929: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5642,13 +5950,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5116: result: yes" >&5
++	echo "configure:5953: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dn_expand=no"
+ 	eval "LIB_dn_expand="
+-	echo "configure:5122: result: no" >&5
++	echo "configure:5959: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5662,7 +5970,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5134: result: yes, in $ac_res" >&5
++	echo "configure:5973: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5671,7 +5979,7 @@
+ 	LIBS="$LIB_dn_expand $LIBS"
+ fi
+ 
+-echo "configure:5141: checking for working snprintf" >&5
++echo "configure:5982: checking for working snprintf" >&5
+ echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5680,8 +5988,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5151 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5992 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5692,20 +6000,21 @@
+ 	snprintf(foo, 2, "12");
+ 	return strcmp(foo, "1");
+ }
+-EOF
+-if { (eval echo configure:5162: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:6005: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_snprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:5173: result: $ac_cv_func_snprintf_working" >&5
++echo "configure:6017: result: $ac_cv_func_snprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
+ 
+ if test "$ac_cv_func_snprintf_working" = yes; then
+@@ -5718,13 +6027,13 @@
+ if test "$ac_cv_func_snprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
+-echo "configure:5183: checking if snprintf needs a prototype" >&5
++echo "configure:6030: checking if snprintf needs a prototype" >&5
+ echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5189 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6036 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5737,17 +6046,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5202: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6051: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_snprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_snprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5211: result: $ac_cv_func_snprintf_noproto" >&5
++echo "configure:6060: result: $ac_cv_func_snprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_snprintf_noproto" = yes; then
+@@ -5762,7 +6072,7 @@
+ 
+ fi
+ 
+-echo "configure:5221: checking for working vsnprintf" >&5
++echo "configure:6075: checking for working vsnprintf" >&5
+ echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5771,8 +6081,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5231 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6085 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5793,20 +6103,21 @@
+ {
+ 	return foo(0, "12");
+ }
+-EOF
+-if { (eval echo configure:5250: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:6108: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_vsnprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:5261: result: $ac_cv_func_vsnprintf_working" >&5
++echo "configure:6120: result: $ac_cv_func_vsnprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+@@ -5819,13 +6130,13 @@
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
+-echo "configure:5271: checking if vsnprintf needs a prototype" >&5
++echo "configure:6133: checking if vsnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5277 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6139 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5838,17 +6149,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5290: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6154: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vsnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vsnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5299: result: $ac_cv_func_vsnprintf_noproto" >&5
++echo "configure:6163: result: $ac_cv_func_vsnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_noproto" = yes; then
+@@ -5863,14 +6175,14 @@
+ 
+ fi
+ 
+-echo "configure:5309: checking for working glob" >&5
++echo "configure:6178: checking for working glob" >&5
+ echo $ECHO_N "checking for working glob... $ECHO_C" >&6
+ if test "${ac_cv_func_glob_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_func_glob_working=yes
+-cat >conftest.$ac_ext <<EOF
+-#line 5316 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 6185 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5884,17 +6196,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5328: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6201: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_glob_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5337: result: $ac_cv_func_glob_working" >&5
++echo "configure:6210: result: $ac_cv_func_glob_working" >&5
+ echo "${ECHO_T}$ac_cv_func_glob_working" >&6
+ 
+ if test "$ac_cv_func_glob_working" = yes; then
+@@ -5907,13 +6220,13 @@
+ if test "$ac_cv_func_glob_working" = yes; then
+ 
+ if test "$ac_cv_func_glob+set" != set -o "$ac_cv_func_glob" = yes; then
+-echo "configure:5347: checking if glob needs a prototype" >&5
++echo "configure:6223: checking if glob needs a prototype" >&5
+ echo $ECHO_N "checking if glob needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_glob_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5353 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6229 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <glob.h>
+@@ -5927,17 +6240,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5367: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6245: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_glob_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_glob_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5376: result: $ac_cv_func_glob_noproto" >&5
++echo "configure:6254: result: $ac_cv_func_glob_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_glob_noproto" >&6
+ 
+ if test "$ac_cv_func_glob_noproto" = yes; then
+@@ -5979,13 +6293,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5410: checking for $ac_func" >&5
++echo "configure:6296: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5416 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6302 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6014,17 +6328,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5444: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6333: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5453: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6342: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6038,7 +6353,7 @@
+ 	LIBOBJS="$LIBOBJS getcap.o"
+ fi
+ 
+-echo "configure:5464: checking for getsockopt" >&5
++echo "configure:6356: checking for getsockopt" >&5
+ echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6053,8 +6368,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5479 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 6372 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -6069,14 +6384,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5495: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6389: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6091,13 +6407,13 @@
+ for ac_func in getsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5513: checking for $ac_func" >&5
++echo "configure:6410: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5519 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6416 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6126,17 +6442,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5547: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6447: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5556: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6456: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6160,13 +6477,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5576: result: yes" >&5
++	echo "configure:6480: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getsockopt=no"
+ 	eval "LIB_getsockopt="
+-	echo "configure:5582: result: no" >&5
++	echo "configure:6486: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6180,12 +6497,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5594: result: yes, in $ac_res" >&5
++	echo "configure:6500: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:5598: checking for setsockopt" >&5
++echo "configure:6505: checking for setsockopt" >&5
+ echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_setsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6200,8 +6517,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5613 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 6521 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -6216,14 +6533,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5629: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6538: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6238,13 +6556,13 @@
+ for ac_func in setsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5647: checking for $ac_func" >&5
++echo "configure:6559: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5653 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6565 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6273,17 +6591,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5681: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6596: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5690: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6605: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6307,13 +6626,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5710: result: yes" >&5
++	echo "configure:6629: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_setsockopt=no"
+ 	eval "LIB_setsockopt="
+-	echo "configure:5716: result: no" >&5
++	echo "configure:6635: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6327,12 +6646,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5728: result: yes, in $ac_res" >&5
++	echo "configure:6649: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:5732: checking for hstrerror" >&5
++echo "configure:6654: checking for hstrerror" >&5
+ echo $ECHO_N "checking for hstrerror... $ECHO_C" >&6
+ if test "${ac_cv_funclib_hstrerror+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6347,8 +6666,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5747 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 6670 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -6360,14 +6679,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5760: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6684: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_hstrerror=$ac_lib; else ac_cv_funclib_hstrerror=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_hstrerror=\${ac_cv_funclib_hstrerror-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6382,13 +6702,13 @@
+ for ac_func in hstrerror
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5778: checking for $ac_func" >&5
++echo "configure:6705: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5784 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6711 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6417,17 +6737,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5812: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6742: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5821: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6751: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6451,13 +6772,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5841: result: yes" >&5
++	echo "configure:6775: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_hstrerror=no"
+ 	eval "LIB_hstrerror="
+-	echo "configure:5847: result: no" >&5
++	echo "configure:6781: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6471,7 +6792,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5859: result: yes, in $ac_res" >&5
++	echo "configure:6795: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6487,13 +6808,13 @@
+ if test "$ac_cv_func_hstrerror" = yes; then
+ 
+ if test "$ac_cv_func_hstrerror+set" != set -o "$ac_cv_func_hstrerror" = yes; then
+-echo "configure:5871: checking if hstrerror needs a prototype" >&5
++echo "configure:6811: checking if hstrerror needs a prototype" >&5
+ echo $ECHO_N "checking if hstrerror needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_hstrerror_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5877 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6817 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_NETDB_H
+@@ -6509,17 +6830,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5892: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6835: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_hstrerror_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_hstrerror_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5901: result: $ac_cv_func_hstrerror_noproto" >&5
++echo "configure:6844: result: $ac_cv_func_hstrerror_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_hstrerror_noproto" >&6
+ 
+ if test "$ac_cv_func_hstrerror_noproto" = yes; then
+@@ -6537,13 +6859,13 @@
+ if test "$ac_cv_func_asprintf" = yes; then
+ 
+ if test "$ac_cv_func_asprintf+set" != set -o "$ac_cv_func_asprintf" = yes; then
+-echo "configure:5913: checking if asprintf needs a prototype" >&5
++echo "configure:6862: checking if asprintf needs a prototype" >&5
+ echo $ECHO_N "checking if asprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_asprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5919 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6868 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6558,17 +6880,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5933: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6885: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_asprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_asprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5942: result: $ac_cv_func_asprintf_noproto" >&5
++echo "configure:6894: result: $ac_cv_func_asprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_asprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_asprintf_noproto" = yes; then
+@@ -6584,13 +6907,13 @@
+ if test "$ac_cv_func_vasprintf" = yes; then
+ 
+ if test "$ac_cv_func_vasprintf+set" != set -o "$ac_cv_func_vasprintf" = yes; then
+-echo "configure:5954: checking if vasprintf needs a prototype" >&5
++echo "configure:6910: checking if vasprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vasprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vasprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5960 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6916 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6605,17 +6928,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5974: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6933: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vasprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vasprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5983: result: $ac_cv_func_vasprintf_noproto" >&5
++echo "configure:6942: result: $ac_cv_func_vasprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vasprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vasprintf_noproto" = yes; then
+@@ -6631,13 +6955,13 @@
+ if test "$ac_cv_func_asnprintf" = yes; then
+ 
+ if test "$ac_cv_func_asnprintf+set" != set -o "$ac_cv_func_asnprintf" = yes; then
+-echo "configure:5995: checking if asnprintf needs a prototype" >&5
++echo "configure:6958: checking if asnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if asnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_asnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6001 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6964 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6652,17 +6976,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6015: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6981: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_asnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_asnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6024: result: $ac_cv_func_asnprintf_noproto" >&5
++echo "configure:6990: result: $ac_cv_func_asnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_asnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_asnprintf_noproto" = yes; then
+@@ -6678,13 +7003,13 @@
+ if test "$ac_cv_func_vasnprintf" = yes; then
+ 
+ if test "$ac_cv_func_vasnprintf+set" != set -o "$ac_cv_func_vasnprintf" = yes; then
+-echo "configure:6036: checking if vasnprintf needs a prototype" >&5
++echo "configure:7006: checking if vasnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vasnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vasnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6042 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7012 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6699,17 +7024,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6056: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7029: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vasnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vasnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6065: result: $ac_cv_func_vasnprintf_noproto" >&5
++echo "configure:7038: result: $ac_cv_func_vasnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vasnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vasnprintf_noproto" = yes; then
+@@ -6723,7 +7049,7 @@
+ fi
+ fi
+ 
+-echo "configure:6075: checking for pidfile" >&5
++echo "configure:7052: checking for pidfile" >&5
+ echo $ECHO_N "checking for pidfile... $ECHO_C" >&6
+ if test "${ac_cv_funclib_pidfile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6738,8 +7064,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 6090 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 7068 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_UTIL_H
+ #include <util.h>
+@@ -6751,14 +7077,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6103: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7082: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_pidfile=$ac_lib; else ac_cv_funclib_pidfile=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_pidfile=\${ac_cv_funclib_pidfile-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6773,13 +7100,13 @@
+ for ac_func in pidfile
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6121: checking for $ac_func" >&5
++echo "configure:7103: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6127 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7109 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6808,17 +7135,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6155: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7140: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6164: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7149: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6842,13 +7170,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:6184: result: yes" >&5
++	echo "configure:7173: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_pidfile=no"
+ 	eval "LIB_pidfile="
+-	echo "configure:6190: result: no" >&5
++	echo "configure:7179: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6862,7 +7190,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:6202: result: yes, in $ac_res" >&5
++	echo "configure:7193: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6938,13 +7266,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6276: checking for $ac_func" >&5
++echo "configure:7269: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6282 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7275 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6973,17 +7301,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6310: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7306: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6319: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7315: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+ 
+@@ -7070,13 +7399,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6401: checking for $ac_func" >&5
++echo "configure:7402: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6407 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7408 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7105,17 +7434,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6435: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7439: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6444: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7448: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7129,13 +7459,13 @@
+ done
+ 
+ if test "$ac_cv_func_setenv+set" != set -o "$ac_cv_func_setenv" = yes; then
+-echo "configure:6455: checking if setenv needs a prototype" >&5
++echo "configure:7462: checking if setenv needs a prototype" >&5
+ echo $ECHO_N "checking if setenv needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_setenv_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6461 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7468 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -7148,17 +7478,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6474: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7483: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_setenv_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_setenv_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6483: result: $ac_cv_func_setenv_noproto" >&5
++echo "configure:7492: result: $ac_cv_func_setenv_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_setenv_noproto" >&6
+ 
+ if test "$ac_cv_func_setenv_noproto" = yes; then
+@@ -7172,13 +7503,13 @@
+ fi
+ 
+ if test "$ac_cv_func_unsetenv+set" != set -o "$ac_cv_func_unsetenv" = yes; then
+-echo "configure:6493: checking if unsetenv needs a prototype" >&5
++echo "configure:7506: checking if unsetenv needs a prototype" >&5
+ echo $ECHO_N "checking if unsetenv needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_unsetenv_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6499 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7512 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -7191,17 +7522,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6512: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7527: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_unsetenv_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_unsetenv_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6521: result: $ac_cv_func_unsetenv_noproto" >&5
++echo "configure:7536: result: $ac_cv_func_unsetenv_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_unsetenv_noproto" >&6
+ 
+ if test "$ac_cv_func_unsetenv_noproto" = yes; then
+@@ -7215,13 +7547,13 @@
+ fi
+ 
+ if test "$ac_cv_func_gethostname+set" != set -o "$ac_cv_func_gethostname" = yes; then
+-echo "configure:6531: checking if gethostname needs a prototype" >&5
++echo "configure:7550: checking if gethostname needs a prototype" >&5
+ echo $ECHO_N "checking if gethostname needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostname_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6537 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7556 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -7234,17 +7566,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6550: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7571: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostname_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_gethostname_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6559: result: $ac_cv_func_gethostname_noproto" >&5
++echo "configure:7580: result: $ac_cv_func_gethostname_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostname_noproto" >&6
+ 
+ if test "$ac_cv_func_gethostname_noproto" = yes; then
+@@ -7258,13 +7591,13 @@
+ fi
+ 
+ if test "$ac_cv_func_mkstemp+set" != set -o "$ac_cv_func_mkstemp" = yes; then
+-echo "configure:6569: checking if mkstemp needs a prototype" >&5
++echo "configure:7594: checking if mkstemp needs a prototype" >&5
+ echo $ECHO_N "checking if mkstemp needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6575 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7600 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -7277,17 +7610,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6588: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7615: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_mkstemp_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_mkstemp_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6597: result: $ac_cv_func_mkstemp_noproto" >&5
++echo "configure:7624: result: $ac_cv_func_mkstemp_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp_noproto" >&6
+ 
+ if test "$ac_cv_func_mkstemp_noproto" = yes; then
+@@ -7301,13 +7635,13 @@
+ fi
+ 
+ if test "$ac_cv_func_getusershell+set" != set -o "$ac_cv_func_getusershell" = yes; then
+-echo "configure:6607: checking if getusershell needs a prototype" >&5
++echo "configure:7638: checking if getusershell needs a prototype" >&5
+ echo $ECHO_N "checking if getusershell needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getusershell_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6613 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7644 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -7320,17 +7654,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6626: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7659: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getusershell_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_getusershell_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6635: result: $ac_cv_func_getusershell_noproto" >&5
++echo "configure:7668: result: $ac_cv_func_getusershell_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_getusershell_noproto" >&6
+ 
+ if test "$ac_cv_func_getusershell_noproto" = yes; then
+@@ -7344,13 +7679,13 @@
+ fi
+ 
+ if test "$ac_cv_func_inet_aton+set" != set -o "$ac_cv_func_inet_aton" = yes; then
+-echo "configure:6645: checking if inet_aton needs a prototype" >&5
++echo "configure:7682: checking if inet_aton needs a prototype" >&5
+ echo $ECHO_N "checking if inet_aton needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_inet_aton_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6651 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7688 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7375,17 +7710,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6675: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7715: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_inet_aton_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_inet_aton_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6684: result: $ac_cv_func_inet_aton_noproto" >&5
++echo "configure:7724: result: $ac_cv_func_inet_aton_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_inet_aton_noproto" >&6
+ 
+ if test "$ac_cv_func_inet_aton_noproto" = yes; then
+@@ -7398,7 +7734,7 @@
+ 
+ fi
+ 
+-echo "configure:6693: checking for crypt" >&5
++echo "configure:7737: checking for crypt" >&5
+ echo $ECHO_N "checking for crypt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7413,8 +7749,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 6708 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 7753 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7424,14 +7760,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6718: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7765: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_crypt=\${ac_cv_funclib_crypt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -7446,13 +7783,13 @@
+ for ac_func in crypt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6736: checking for $ac_func" >&5
++echo "configure:7786: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6742 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7792 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7481,17 +7818,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6770: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7823: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6779: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7832: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7515,13 +7853,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:6799: result: yes" >&5
++	echo "configure:7856: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_crypt=no"
+ 	eval "LIB_crypt="
+-	echo "configure:6805: result: no" >&5
++	echo "configure:7862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -7535,18 +7873,18 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:6817: result: yes, in $ac_res" >&5
++	echo "configure:7876: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:6821: checking if gethostbyname is compatible with system prototype" >&5
++echo "configure:7881: checking if gethostbyname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if gethostbyname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6827 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7887 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7572,17 +7910,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6852: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7915: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostbyname_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_gethostbyname_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6861: result: $ac_cv_func_gethostbyname_proto_compat" >&5
++echo "configure:7924: result: $ac_cv_func_gethostbyname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_gethostbyname_proto_compat" = yes; then
+@@ -7593,13 +7932,13 @@
+ 
+ fi
+ 
+-echo "configure:6869: checking if gethostbyaddr is compatible with system prototype" >&5
++echo "configure:7935: checking if gethostbyaddr is compatible with system prototype" >&5
+ echo $ECHO_N "checking if gethostbyaddr is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyaddr_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6875 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7941 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7625,17 +7964,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6900: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7969: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostbyaddr_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_gethostbyaddr_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6909: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
++echo "configure:7978: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyaddr_proto_compat" >&6
+ 
+ if test "$ac_cv_func_gethostbyaddr_proto_compat" = yes; then
+@@ -7646,13 +7986,13 @@
+ 
+ fi
+ 
+-echo "configure:6917: checking if getservbyname is compatible with system prototype" >&5
++echo "configure:7989: checking if getservbyname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if getservbyname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getservbyname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6923 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7995 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7678,17 +8018,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6948: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8023: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getservbyname_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_getservbyname_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6957: result: $ac_cv_func_getservbyname_proto_compat" >&5
++echo "configure:8032: result: $ac_cv_func_getservbyname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_getservbyname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_getservbyname_proto_compat" = yes; then
+@@ -7699,13 +8040,13 @@
+ 
+ fi
+ 
+-echo "configure:6965: checking if getsockname is compatible with system prototype" >&5
++echo "configure:8043: checking if getsockname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if getsockname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getsockname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6971 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8049 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7722,17 +8063,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6987: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8068: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getsockname_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_getsockname_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6996: result: $ac_cv_func_getsockname_proto_compat" >&5
++echo "configure:8077: result: $ac_cv_func_getsockname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_getsockname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_getsockname_proto_compat" = yes; then
+@@ -7743,13 +8085,13 @@
+ 
+ fi
+ 
+-echo "configure:7004: checking if openlog is compatible with system prototype" >&5
++echo "configure:8088: checking if openlog is compatible with system prototype" >&5
+ echo $ECHO_N "checking if openlog is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_openlog_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7010 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8094 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYSLOG_H
+@@ -7763,17 +8105,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7023: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8110: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_openlog_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_openlog_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7032: result: $ac_cv_func_openlog_proto_compat" >&5
++echo "configure:8119: result: $ac_cv_func_openlog_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_openlog_proto_compat" >&6
+ 
+ if test "$ac_cv_func_openlog_proto_compat" = yes; then
+@@ -7785,13 +8128,13 @@
+ fi
+ 
+ if test "$ac_cv_func_crypt+set" != set -o "$ac_cv_func_crypt" = yes; then
+-echo "configure:7041: checking if crypt needs a prototype" >&5
++echo "configure:8131: checking if crypt needs a prototype" >&5
+ echo $ECHO_N "checking if crypt needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_crypt_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7047 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8137 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_CRYPT_H
+@@ -7811,17 +8154,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7065: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8159: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_crypt_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_crypt_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7074: result: $ac_cv_func_crypt_noproto" >&5
++echo "configure:8168: result: $ac_cv_func_crypt_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_crypt_noproto" >&6
+ 
+ if test "$ac_cv_func_crypt_noproto" = yes; then
+@@ -7835,13 +8179,13 @@
+ fi
+ 
+ if test "$ac_cv_func_strtok_r+set" != set -o "$ac_cv_func_strtok_r" = yes; then
+-echo "configure:7084: checking if strtok_r needs a prototype" >&5
++echo "configure:8182: checking if strtok_r needs a prototype" >&5
+ echo $ECHO_N "checking if strtok_r needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_strtok_r_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7090 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8188 "configure"
+ #include "confdefs.h"
+ 
+ #include <string.h>
+@@ -7856,17 +8200,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7103: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8205: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_strtok_r_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_strtok_r_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7112: result: $ac_cv_func_strtok_r_noproto" >&5
++echo "configure:8214: result: $ac_cv_func_strtok_r_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_strtok_r_noproto" >&6
+ 
+ if test "$ac_cv_func_strtok_r_noproto" = yes; then
+@@ -7880,13 +8225,13 @@
+ fi
+ 
+ if test "$ac_cv_func_strsep+set" != set -o "$ac_cv_func_strsep" = yes; then
+-echo "configure:7122: checking if strsep needs a prototype" >&5
++echo "configure:8228: checking if strsep needs a prototype" >&5
+ echo $ECHO_N "checking if strsep needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_strsep_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7128 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8234 "configure"
+ #include "confdefs.h"
+ 
+ #include <string.h>
+@@ -7901,17 +8246,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7141: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8251: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_strsep_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_strsep_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7150: result: $ac_cv_func_strsep_noproto" >&5
++echo "configure:8260: result: $ac_cv_func_strsep_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_strsep_noproto" >&6
+ 
+ if test "$ac_cv_func_strsep_noproto" = yes; then
+@@ -7924,14 +8270,14 @@
+ 
+ fi
+ 
+-echo "configure:7159: checking for h_errno" >&5
++echo "configure:8273: checking for h_errno" >&5
+ echo $ECHO_N "checking for h_errno... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7165 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8280 "configure"
+ #include "confdefs.h"
+ extern int h_errno;
+ int foo() { return h_errno; }
+@@ -7942,20 +8288,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7177: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8293: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_errno=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_h_errno=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_errno`
+-echo "configure:7187: result: $ac_foo" >&5
++echo "configure:8305: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -7964,14 +8311,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7195: checking if h_errno is properly declared" >&5
++echo "configure:8314: checking if h_errno is properly declared" >&5
+ echo $ECHO_N "checking if h_errno is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errno_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7201 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8321 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -7987,19 +8334,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7218: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8339: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_h_errno_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_h_errno_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7227: result: $ac_cv_var_h_errno_declaration" >&5
++echo "configure:8350: result: $ac_cv_var_h_errno_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_h_errno_declaration" >&6
+ if eval "test \"\$ac_cv_var_h_errno_declaration\" = yes"; then
+ 	
+@@ -8011,14 +8359,14 @@
+ 
+ fi
+ 
+-echo "configure:7236: checking for h_errlist" >&5
++echo "configure:8362: checking for h_errlist" >&5
+ echo $ECHO_N "checking for h_errlist... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errlist+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7242 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8369 "configure"
+ #include "confdefs.h"
+ extern int h_errlist;
+ int foo() { return h_errlist; }
+@@ -8029,20 +8377,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7254: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8382: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_errlist=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_h_errlist=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_errlist`
+-echo "configure:7264: result: $ac_foo" >&5
++echo "configure:8394: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8051,14 +8400,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7272: checking if h_errlist is properly declared" >&5
++echo "configure:8403: checking if h_errlist is properly declared" >&5
+ echo $ECHO_N "checking if h_errlist is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errlist_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7278 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8410 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -8071,19 +8420,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7292: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8425: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_h_errlist_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_h_errlist_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7301: result: $ac_cv_var_h_errlist_declaration" >&5
++echo "configure:8436: result: $ac_cv_var_h_errlist_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_h_errlist_declaration" >&6
+ if eval "test \"\$ac_cv_var_h_errlist_declaration\" = yes"; then
+ 	
+@@ -8095,14 +8445,14 @@
+ 
+ fi
+ 
+-echo "configure:7310: checking for h_nerr" >&5
++echo "configure:8448: checking for h_nerr" >&5
+ echo $ECHO_N "checking for h_nerr... $ECHO_C" >&6
+ if test "${ac_cv_var_h_nerr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7316 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8455 "configure"
+ #include "confdefs.h"
+ extern int h_nerr;
+ int foo() { return h_nerr; }
+@@ -8113,20 +8463,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7328: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8468: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_nerr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_h_nerr=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_nerr`
+-echo "configure:7338: result: $ac_foo" >&5
++echo "configure:8480: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8135,14 +8486,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7346: checking if h_nerr is properly declared" >&5
++echo "configure:8489: checking if h_nerr is properly declared" >&5
+ echo $ECHO_N "checking if h_nerr is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_h_nerr_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7352 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8496 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -8155,19 +8506,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7366: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8511: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_h_nerr_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_h_nerr_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7375: result: $ac_cv_var_h_nerr_declaration" >&5
++echo "configure:8522: result: $ac_cv_var_h_nerr_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_h_nerr_declaration" >&6
+ if eval "test \"\$ac_cv_var_h_nerr_declaration\" = yes"; then
+ 	
+@@ -8179,14 +8531,14 @@
+ 
+ fi
+ 
+-echo "configure:7384: checking for __progname" >&5
++echo "configure:8534: checking for __progname" >&5
+ echo $ECHO_N "checking for __progname... $ECHO_C" >&6
+ if test "${ac_cv_var___progname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7390 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8541 "configure"
+ #include "confdefs.h"
+ extern int __progname;
+ int foo() { return __progname; }
+@@ -8197,20 +8549,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7402: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8554: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var___progname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var___progname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var___progname`
+-echo "configure:7412: result: $ac_foo" >&5
++echo "configure:8566: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8219,14 +8572,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7420: checking if __progname is properly declared" >&5
++echo "configure:8575: checking if __progname is properly declared" >&5
+ echo $ECHO_N "checking if __progname is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var___progname_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7426 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8582 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_ERR_H
+ #include <err.h>
+@@ -8239,19 +8592,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7440: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8597: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var___progname_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var___progname_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7449: result: $ac_cv_var___progname_declaration" >&5
++echo "configure:8608: result: $ac_cv_var___progname_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var___progname_declaration" >&6
+ if eval "test \"\$ac_cv_var___progname_declaration\" = yes"; then
+ 	
+@@ -8263,14 +8617,14 @@
+ 
+ fi
+ 
+-echo "configure:7458: checking if optarg is properly declared" >&5
++echo "configure:8620: checking if optarg is properly declared" >&5
+ echo $ECHO_N "checking if optarg is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optarg_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7464 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8627 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8284,19 +8638,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7479: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8643: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optarg_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_optarg_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7488: result: $ac_cv_var_optarg_declaration" >&5
++echo "configure:8654: result: $ac_cv_var_optarg_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optarg_declaration" >&6
+ if eval "test \"\$ac_cv_var_optarg_declaration\" = yes"; then
+ 	
+@@ -8306,14 +8661,14 @@
+ 
+ fi
+ 
+-echo "configure:7496: checking if optind is properly declared" >&5
++echo "configure:8664: checking if optind is properly declared" >&5
+ echo $ECHO_N "checking if optind is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optind_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7502 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8671 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8327,19 +8682,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7517: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8687: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optind_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_optind_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7526: result: $ac_cv_var_optind_declaration" >&5
++echo "configure:8698: result: $ac_cv_var_optind_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optind_declaration" >&6
+ if eval "test \"\$ac_cv_var_optind_declaration\" = yes"; then
+ 	
+@@ -8349,14 +8705,14 @@
+ 
+ fi
+ 
+-echo "configure:7534: checking if opterr is properly declared" >&5
++echo "configure:8708: checking if opterr is properly declared" >&5
+ echo $ECHO_N "checking if opterr is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_opterr_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7540 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8715 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8370,19 +8726,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7555: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8731: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_opterr_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_opterr_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7564: result: $ac_cv_var_opterr_declaration" >&5
++echo "configure:8742: result: $ac_cv_var_opterr_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_opterr_declaration" >&6
+ if eval "test \"\$ac_cv_var_opterr_declaration\" = yes"; then
+ 	
+@@ -8392,14 +8749,14 @@
+ 
+ fi
+ 
+-echo "configure:7572: checking if optopt is properly declared" >&5
++echo "configure:8752: checking if optopt is properly declared" >&5
+ echo $ECHO_N "checking if optopt is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optopt_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7578 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8759 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8413,19 +8770,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7593: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8775: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optopt_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_optopt_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7602: result: $ac_cv_var_optopt_declaration" >&5
++echo "configure:8786: result: $ac_cv_var_optopt_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optopt_declaration" >&6
+ if eval "test \"\$ac_cv_var_optopt_declaration\" = yes"; then
+ 	
+@@ -8435,14 +8793,14 @@
+ 
+ fi
+ 
+-echo "configure:7610: checking if environ is properly declared" >&5
++echo "configure:8796: checking if environ is properly declared" >&5
+ echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_environ_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7616 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8803 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ extern struct { int foo; } environ;
+@@ -8453,19 +8811,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7628: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8816: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_environ_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_environ_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7637: result: $ac_cv_var_environ_declaration" >&5
++echo "configure:8827: result: $ac_cv_var_environ_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_environ_declaration" >&6
+ if eval "test \"\$ac_cv_var_environ_declaration\" = yes"; then
+ 	
+@@ -8475,14 +8834,14 @@
+ 
+ fi
+ 
+-echo "configure:7645: checking for tm_gmtoff in struct tm" >&5
++echo "configure:8837: checking for tm_gmtoff in struct tm" >&5
+ echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7651 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8844 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -8492,17 +8851,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7662: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8856: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_gmtoff=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_gmtoff=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7671: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
++echo "configure:8865: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
+ if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
+ 	
+@@ -8514,14 +8874,14 @@
+ 	
+ fi
+ 
+-echo "configure:7681: checking for tm_zone in struct tm" >&5
++echo "configure:8877: checking for tm_zone in struct tm" >&5
+ echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7687 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8884 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -8531,17 +8891,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7698: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8896: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_zone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_zone=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7707: result: $ac_cv_type_struct_tm_tm_zone" >&5
++echo "configure:8905: result: $ac_cv_type_struct_tm_tm_zone" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
+ if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
+ 	
+@@ -8553,14 +8914,14 @@
+ 	
+ fi
+ 
+-echo "configure:7717: checking for timezone" >&5
++echo "configure:8917: checking for timezone" >&5
+ echo $ECHO_N "checking for timezone... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7723 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8924 "configure"
+ #include "confdefs.h"
+ extern int timezone;
+ int foo() { return timezone; }
+@@ -8571,20 +8932,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7735: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8937: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_timezone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_timezone=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_timezone`
+-echo "configure:7745: result: $ac_foo" >&5
++echo "configure:8949: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8593,14 +8955,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7753: checking if timezone is properly declared" >&5
++echo "configure:8958: checking if timezone is properly declared" >&5
+ echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7759 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8965 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ extern struct { int foo; } timezone;
+@@ -8611,19 +8973,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7771: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8978: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_timezone_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_timezone_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7780: result: $ac_cv_var_timezone_declaration" >&5
++echo "configure:8989: result: $ac_cv_var_timezone_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
+ if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
+ 	
+@@ -8636,13 +8999,13 @@
+ fi
+ 
+ cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
+-echo "configure:7790: checking for sa_family_t" >&5
++echo "configure:9002: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7796 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9008 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8657,29 +9020,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7812: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9025: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:7822: result: $ac_foo" >&5
++echo "configure:9035: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:7827: checking for sa_family_t" >&5
++	echo "configure:9040: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sa_family_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7833 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9046 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8692,17 +9056,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7847: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9061: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_sa_family_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_sa_family_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7856: result: $ac_cv_type_sa_family_t" >&5
++echo "configure:9070: result: $ac_cv_type_sa_family_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
+ if test $ac_cv_type_sa_family_t = yes; then
+ 
+@@ -8721,13 +9086,13 @@
+ fi
+ 
+ cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
+-echo "configure:7869: checking for socklen_t" >&5
++echo "configure:9089: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7875 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9095 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8742,29 +9107,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7891: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9112: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:7901: result: $ac_foo" >&5
++echo "configure:9122: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:7906: checking for socklen_t" >&5
++	echo "configure:9127: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if test "${ac_cv_type_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7912 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9133 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8777,17 +9143,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7926: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9148: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_socklen_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_socklen_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7935: result: $ac_cv_type_socklen_t" >&5
++echo "configure:9157: result: $ac_cv_type_socklen_t" >&5
+ echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+ if test $ac_cv_type_socklen_t = yes; then
+ 
+@@ -8806,13 +9173,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+-echo "configure:7948: checking for struct sockaddr" >&5
++echo "configure:9176: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7954 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9182 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8827,29 +9194,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7970: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9199: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:7980: result: $ac_foo" >&5
++echo "configure:9209: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:7985: checking for struct sockaddr" >&5
++	echo "configure:9214: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7991 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9220 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8862,17 +9230,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8005: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9235: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8014: result: $ac_cv_type_struct_sockaddr" >&5
++echo "configure:9244: result: $ac_cv_type_struct_sockaddr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
+ if test $ac_cv_type_struct_sockaddr = yes; then
+ 
+@@ -8891,13 +9260,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-echo "configure:8027: checking for struct sockaddr_storage" >&5
++echo "configure:9263: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8033 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9269 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8912,29 +9281,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8049: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9286: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:8059: result: $ac_foo" >&5
++echo "configure:9296: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:8064: checking for struct sockaddr_storage" >&5
++	echo "configure:9301: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8070 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9307 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8947,17 +9317,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8084: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9322: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_storage=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_storage=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8093: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "configure:9331: result: $ac_cv_type_struct_sockaddr_storage" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
+ if test $ac_cv_type_struct_sockaddr_storage = yes; then
+ 
+@@ -8976,13 +9347,13 @@
+ fi
+ 
+ cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-echo "configure:8106: checking for struct addrinfo" >&5
++echo "configure:9350: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8112 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9356 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8997,29 +9368,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8128: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9373: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:8138: result: $ac_foo" >&5
++echo "configure:9383: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:8143: checking for struct addrinfo" >&5
++	echo "configure:9388: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_addrinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8149 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9394 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9032,17 +9404,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8163: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9409: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_addrinfo=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_addrinfo=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8172: result: $ac_cv_type_struct_addrinfo" >&5
++echo "configure:9418: result: $ac_cv_type_struct_addrinfo" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
+ if test $ac_cv_type_struct_addrinfo = yes; then
+ 
+@@ -9060,7 +9433,7 @@
+ 
+ fi
+ 
+-echo "configure:8184: checking for struct winsize" >&5
++echo "configure:9436: checking for struct winsize" >&5
+ echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
+ if test "${ac_cv_struct_winsize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9068,12 +9441,12 @@
+ 
+ ac_cv_struct_winsize=no
+ for i in sys/termios.h sys/ioctl.h; do
+-cat >conftest.$ac_ext <<EOF
+-#line 8192 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9445 "configure"
+ #include "confdefs.h"
+ #include <$i>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "struct[ 	]*winsize" >/dev/null 2>&1; then
+   ac_cv_struct_winsize=yes; break
+@@ -9090,14 +9463,14 @@
+ EOF
+ 
+ fi
+-echo "configure:8208: result: $ac_cv_struct_winsize" >&5
++echo "configure:9466: result: $ac_cv_struct_winsize" >&5
+ echo "${ECHO_T}$ac_cv_struct_winsize" >&6
+-cat >conftest.$ac_ext <<EOF
+-#line 8211 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9469 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_xpixel" >/dev/null 2>&1; then
+ 
+@@ -9108,12 +9481,12 @@
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 8223 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9485 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_ypixel" >/dev/null 2>&1; then
+ 
+@@ -9124,14 +9497,14 @@
+ fi
+ rm -f conftest*
+ 
+-echo "configure:8234: checking for struct spwd" >&5
++echo "configure:9500: checking for struct spwd" >&5
+ echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
+ if test "${ac_cv_struct_spwd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 8240 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9507 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ #ifdef HAVE_SHADOW_H
+@@ -9144,19 +9517,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8254: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9522: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_spwd=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_struct_spwd=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:8263: result: $ac_cv_struct_spwd" >&5
++echo "configure:9533: result: $ac_cv_struct_spwd" >&5
+ echo "${ECHO_T}$ac_cv_struct_spwd" >&6
+ 
+ if test "$ac_cv_struct_spwd" = "yes"; then
+@@ -9167,14 +9541,14 @@
+ 
+ fi
+ 
+-echo "configure:8270: checking for sa_len in struct sockaddr" >&5
++echo "configure:9544: checking for sa_len in struct sockaddr" >&5
+ echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 8276 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9551 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -9185,17 +9559,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8288: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9564: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_sa_len=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_sa_len=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8297: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
++echo "configure:9573: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
+ if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
+ 	
+@@ -9217,7 +9592,8 @@
+ if test "${with_openldap+set}" = set; then
+   withval="$with_openldap"
+ 
+-fi
++fi;
++
+ # Check whether --with-openldap-lib or --without-openldap-lib was given.
+ if test "${with_openldap_lib+set}" = set; then
+   withval="$with_openldap_lib"
+@@ -9226,7 +9602,8 @@
+ elif test "X$with_openldap" = "X"; then
+   with_openldap=yes
+ fi
+-fi
++fi;
++
+ # Check whether --with-openldap-include or --without-openldap-include was given.
+ if test "${with_openldap_include+set}" = set; then
+   withval="$with_openldap_include"
+@@ -9235,9 +9612,9 @@
+ elif test "X$with_openldap" = "X"; then
+   with_openldap=yes
+ fi
+-fi
++fi;
+ 
+-echo "configure:8332: checking for openldap" >&5
++echo "configure:9617: checking for openldap" >&5
+ echo $ECHO_N "checking for openldap... $ECHO_C" >&6
+ 
+ case "$with_openldap" in
+@@ -9255,7 +9632,7 @@
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -9276,8 +9653,8 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8369 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9657 "configure"
+ #include "confdefs.h"
+ #include <ldap.h>
+ int
+@@ -9287,19 +9664,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8379: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9669: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lldap -llber  $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8390 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9680 "configure"
+ #include "confdefs.h"
+ #include <ldap.h>
+ int
+@@ -9309,14 +9687,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8400: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:9692: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+@@ -9324,6 +9703,7 @@
+ if test "$ires" -a "$lres" -a "$with_openldap" != "no"; then
+ 	openldap_includedir="$ires"
+ 	openldap_libdir="$lres"
++	DIR_openldap=
+ 	INCLUDE_openldap="-I$openldap_includedir"
+ 	LIB_openldap="-L$openldap_libdir -lldap -llber"
+ 	
+@@ -9332,13 +9712,14 @@
+ EOF
+ 
+ 	with_openldap=yes
+-	echo "configure:8420: result: headers $ires, libraries $lres" >&5
++	echo "configure:9715: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_openldap="openldap"
+ 	INCLUDE_openldap=
+ 	LIB_openldap=
+ 	with_openldap=no
+-	echo "configure:8426: result: $with_openldap" >&5
++	echo "configure:9722: result: $with_openldap" >&5
+ echo "${ECHO_T}$with_openldap" >&6
+ fi
+ 
+@@ -9350,7 +9731,8 @@
+ if test "${with_krb4+set}" = set; then
+   withval="$with_krb4"
+ 
+-fi
++fi;
++
+ # Check whether --with-krb4-lib or --without-krb4-lib was given.
+ if test "${with_krb4_lib+set}" = set; then
+   withval="$with_krb4_lib"
+@@ -9359,7 +9741,8 @@
+ elif test "X$with_krb4" = "X"; then
+   with_krb4=yes
+ fi
+-fi
++fi;
++
+ # Check whether --with-krb4-include or --without-krb4-include was given.
+ if test "${with_krb4_include+set}" = set; then
+   withval="$with_krb4_include"
+@@ -9368,9 +9751,9 @@
+ elif test "X$with_krb4" = "X"; then
+   with_krb4=yes
+ fi
+-fi
++fi;
+ 
+-echo "configure:8454: checking for krb4" >&5
++echo "configure:9756: checking for krb4" >&5
+ echo $ECHO_N "checking for krb4... $ECHO_C" >&6
+ 
+ case "$with_krb4" in
+@@ -9388,7 +9771,7 @@
+ header_dirs=
+ lib_dirs=
+ d='/usr/athena'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -9409,8 +9792,8 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8491 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9796 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9420,19 +9803,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8501: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9808: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lkrb -ldes $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8512 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9819 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9442,14 +9826,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8522: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:9831: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+@@ -9457,6 +9842,7 @@
+ if test "$ires" -a "$lres" -a "$with_krb4" != "no"; then
+ 	krb4_includedir="$ires"
+ 	krb4_libdir="$lres"
++	DIR_krb4=
+ 	INCLUDE_krb4="-I$krb4_includedir"
+ 	LIB_krb4="-L$krb4_libdir -lkrb"
+ 	
+@@ -9465,13 +9851,14 @@
+ EOF
+ 
+ 	with_krb4=yes
+-	echo "configure:8542: result: headers $ires, libraries $lres" >&5
++	echo "configure:9854: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_krb4="krb4"
+ 	INCLUDE_krb4=
+ 	LIB_krb4=
+ 	with_krb4=no
+-	echo "configure:8548: result: $with_krb4" >&5
++	echo "configure:9861: result: $with_krb4" >&5
+ echo "${ECHO_T}$with_krb4" >&6
+ fi
+ 
+@@ -9483,13 +9870,13 @@
+ 	LIBS="$LIB_krb4 -ldes $LIBS"
+ 	EXTRA_LIB45=lib45.a
+ 	
+-	echo "configure:8559: checking for four valued krb_put_int" >&5
++	echo "configure:9873: checking for four valued krb_put_int" >&5
+ echo $ECHO_N "checking for four valued krb_put_int... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_put_int_four+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8565 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9879 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9501,18 +9888,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8577: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9893: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_put_int_four=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_put_int_four=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:8587: result: $ac_cv_func_krb_put_int_four" >&5
++echo "configure:9903: result: $ac_cv_func_krb_put_int_four" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_put_int_four" >&6
+ 	if test "$ac_cv_func_krb_put_int_four" = yes; then
+ 		
+@@ -9523,13 +9911,13 @@
+ 	fi
+ 	
+ 
+-	echo "configure:8596: checking for KRB_VERIFY_SECURE" >&5
++	echo "configure:9914: checking for KRB_VERIFY_SECURE" >&5
+ echo $ECHO_N "checking for KRB_VERIFY_SECURE... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_verify_secure+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8602 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9920 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9540,18 +9928,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8613: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9933: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_verify_secure=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_verify_secure=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:8623: result: $ac_cv_func_krb_verify_secure" >&5
++echo "configure:9943: result: $ac_cv_func_krb_verify_secure" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_verify_secure" >&6
+ 	if test "$ac_cv_func_krb_verify_secure" != yes; then
+ 		
+@@ -9565,13 +9954,13 @@
+ EOF
+ 
+ 	fi
+-	echo "configure:8635: checking for KRB_VERIFY_NOT_SECURE" >&5
++	echo "configure:9957: checking for KRB_VERIFY_NOT_SECURE" >&5
+ echo $ECHO_N "checking for KRB_VERIFY_NOT_SECURE... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_verify_not_secure+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8641 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9963 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9582,18 +9971,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8652: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9976: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_verify_not_secure=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_verify_not_secure=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:8662: result: $ac_cv_func_krb_verify_not_secure" >&5
++echo "configure:9986: result: $ac_cv_func_krb_verify_not_secure" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_verify_not_secure" >&6
+ 	if test "$ac_cv_func_krb_verify_not_secure" != yes; then
+ 		
+@@ -9604,7 +9994,7 @@
+ 	fi
+ 	
+ 
+-echo "configure:8671: checking for krb_enable_debug" >&5
++echo "configure:9997: checking for krb_enable_debug" >&5
+ echo $ECHO_N "checking for krb_enable_debug... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_enable_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9619,8 +10009,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 8686 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 10013 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9630,14 +10020,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8696: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10025: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_enable_debug=$ac_lib; else ac_cv_funclib_krb_enable_debug=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_krb_enable_debug=\${ac_cv_funclib_krb_enable_debug-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -9652,13 +10043,13 @@
+ for ac_func in krb_enable_debug
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:8714: checking for $ac_func" >&5
++echo "configure:10046: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8720 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10052 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -9687,17 +10078,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8748: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10083: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:8757: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10092: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -9721,13 +10113,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:8777: result: yes" >&5
++	echo "configure:10116: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_enable_debug=no"
+ 	eval "LIB_krb_enable_debug="
+-	echo "configure:8783: result: no" >&5
++	echo "configure:10122: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -9741,7 +10133,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:8795: result: yes, in $ac_res" >&5
++	echo "configure:10136: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -9752,7 +10144,7 @@
+ 
+ 	
+ 
+-echo "configure:8803: checking for krb_disable_debug" >&5
++echo "configure:10147: checking for krb_disable_debug" >&5
+ echo $ECHO_N "checking for krb_disable_debug... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_disable_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9767,8 +10159,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 8818 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 10163 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9778,14 +10170,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8828: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10175: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_disable_debug=$ac_lib; else ac_cv_funclib_krb_disable_debug=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_krb_disable_debug=\${ac_cv_funclib_krb_disable_debug-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -9800,13 +10193,13 @@
+ for ac_func in krb_disable_debug
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:8846: checking for $ac_func" >&5
++echo "configure:10196: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8852 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10202 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -9835,17 +10228,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8880: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10233: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:8889: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10242: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -9869,13 +10263,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:8909: result: yes" >&5
++	echo "configure:10266: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_disable_debug=no"
+ 	eval "LIB_krb_disable_debug="
+-	echo "configure:8915: result: no" >&5
++	echo "configure:10272: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -9889,7 +10283,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:8927: result: yes, in $ac_res" >&5
++	echo "configure:10286: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -9900,7 +10294,7 @@
+ 
+ 	
+ 
+-echo "configure:8935: checking for krb_get_our_ip_for_realm" >&5
++echo "configure:10297: checking for krb_get_our_ip_for_realm" >&5
+ echo $ECHO_N "checking for krb_get_our_ip_for_realm... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_get_our_ip_for_realm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9915,8 +10309,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 8950 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 10313 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9926,14 +10320,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8960: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10325: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_get_our_ip_for_realm=$ac_lib; else ac_cv_funclib_krb_get_our_ip_for_realm=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_krb_get_our_ip_for_realm=\${ac_cv_funclib_krb_get_our_ip_for_realm-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -9948,13 +10343,13 @@
+ for ac_func in krb_get_our_ip_for_realm
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:8978: checking for $ac_func" >&5
++echo "configure:10346: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8984 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10352 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -9983,17 +10378,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9012: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10383: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:9021: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10392: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -10017,13 +10413,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:9041: result: yes" >&5
++	echo "configure:10416: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_get_our_ip_for_realm=no"
+ 	eval "LIB_krb_get_our_ip_for_realm="
+-	echo "configure:9047: result: no" >&5
++	echo "configure:10422: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -10037,7 +10433,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:9059: result: yes, in $ac_res" >&5
++	echo "configure:10436: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -10046,13 +10442,13 @@
+ 	LIBS="$LIB_krb_get_our_ip_for_realm $LIBS"
+ fi
+ 
+-	echo "configure:9066: checking for krb_mk_req with const arguments" >&5
++	echo "configure:10445: checking for krb_mk_req with const arguments" >&5
+ echo $ECHO_N "checking for krb_mk_req with const arguments... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_mk_req_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9072 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10451 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ 		int krb_mk_req(KTEXT a, const char *s, const char *i,
+@@ -10065,18 +10461,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9085: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10466: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_mk_req_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_mk_req_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:9095: result: $ac_cv_func_krb_mk_req_const" >&5
++echo "configure:10476: result: $ac_cv_func_krb_mk_req_const" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_mk_req_const" >&6
+ 	if test "$ac_cv_func_krb_mk_req_const" = "yes"; then
+ 		
+@@ -10119,7 +10516,7 @@
+ if test "${enable_dce+set}" = set; then
+   enableval="$enable_dce"
+ 
+-fi
++fi;
+ if test "$enable_dce" = yes; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -10149,7 +10546,7 @@
+ if test "${enable_kaserver+set}" = set; then
+   enableval="$enable_kaserver"
+ 
+-fi
++fi;
+ if test "$enable_kaserver" = yes; then
+ 	
+ cat >>confdefs.h <<\EOF
+@@ -10166,7 +10563,7 @@
+ if test "${enable_kaserver_db+set}" = set; then
+   enableval="$enable_kaserver_db"
+ 
+-fi
++fi;
+ if test "$enable_kaserver_db" = yes; then
+ 	
+ cat >>confdefs.h <<\EOF
+@@ -10188,7 +10585,7 @@
+ 	otp=no
+ fi
+ 
+-fi
++fi;
+ if test "$otp" = "yes"; then
+ 	
+ cat >>confdefs.h <<\EOF
+@@ -10210,7 +10607,7 @@
+ if test "${enable_osfc2+set}" = set; then
+   enableval="$enable_osfc2"
+ 
+-fi
++fi;
+ LIB_security=
+ if test "$enable_osfc2" = yes; then
+ 	
+@@ -10223,7 +10620,7 @@
+ 
+ # Extract the first word of "nroff", so it can be a program name with args.
+ set dummy nroff; ac_word=$2
+-echo "configure:9216: checking for $ac_word" >&5
++echo "configure:10623: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_NROFF+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10239,7 +10636,7 @@
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+   if test -f "$ac_dir/$ac_word"; then
+-   ac_cv_path_NROFF=$ac_dir/$ac_word
++   ac_cv_path_NROFF="$ac_dir/$ac_word"
+    break
+ fi
+ done
+@@ -10248,17 +10645,18 @@
+ esac
+ fi
+ NROFF=$ac_cv_path_NROFF
++
+ if test -n "$NROFF"; then
+-  echo "configure:9241: result: $NROFF" >&5
++  echo "configure:10650: result: $NROFF" >&5
+ echo "${ECHO_T}$NROFF" >&6
+ else
+-  echo "configure:9244: result: no" >&5
++  echo "configure:10653: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ # Extract the first word of "groff", so it can be a program name with args.
+ set dummy groff; ac_word=$2
+-echo "configure:9249: checking for $ac_word" >&5
++echo "configure:10659: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_GROFF+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10274,7 +10672,7 @@
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+   if test -f "$ac_dir/$ac_word"; then
+-   ac_cv_path_GROFF=$ac_dir/$ac_word
++   ac_cv_path_GROFF="$ac_dir/$ac_word"
+    break
+ fi
+ done
+@@ -10283,15 +10681,16 @@
+ esac
+ fi
+ GROFF=$ac_cv_path_GROFF
++
+ if test -n "$GROFF"; then
+-  echo "configure:9274: result: $GROFF" >&5
++  echo "configure:10686: result: $GROFF" >&5
+ echo "${ECHO_T}$GROFF" >&6
+ else
+-  echo "configure:9277: result: no" >&5
++  echo "configure:10689: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "configure:9280: checking how to format man pages" >&5
++echo "configure:10693: checking how to format man pages" >&5
+ echo $ECHO_N "checking how to format man pages... $ECHO_C" >&6
+ if test "${ac_cv_sys_man_format+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10328,96 +10727,370 @@
+ fi
+ 
+ fi
+-echo "configure:9315: result: $ac_cv_sys_man_format" >&5
+-echo "${ECHO_T}$ac_cv_sys_man_format" >&6
+-if test "$ac_cv_sys_man_format"; then
+-	CATMAN="$ac_cv_sys_man_format"
+-	
+-fi
++echo "configure:10730: result: $ac_cv_sys_man_format" >&5
++echo "${ECHO_T}$ac_cv_sys_man_format" >&6
++if test "$ac_cv_sys_man_format"; then
++	CATMAN="$ac_cv_sys_man_format"
++	
++fi
++
++if test "$CATMAN"; then
++  CATMAN_TRUE=
++  CATMAN_FALSE='#'
++else
++  CATMAN_TRUE='#'
++  CATMAN_FALSE=
++fi
++echo "configure:10744: checking extension of pre-formatted manual pages" >&5
++echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
++if test "${ac_cv_sys_catman_ext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
++	ac_cv_sys_catman_ext=0
++else
++	ac_cv_sys_catman_ext=number
++fi
++
++fi
++echo "configure:10756: result: $ac_cv_sys_catman_ext" >&5
++echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
++if test "$ac_cv_sys_catman_ext" = number; then
++	CATMANEXT='$$ext'
++else
++	CATMANEXT=0
++fi
++
++# Check whether --with-readline or --without-readline was given.
++if test "${with_readline+set}" = set; then
++  withval="$with_readline"
++
++fi;
++
++# Check whether --with-readline-lib or --without-readline-lib was given.
++if test "${with_readline_lib+set}" = set; then
++  withval="$with_readline_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-readline-lib" >&2; exit 1; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi;
++
++# Check whether --with-readline-include or --without-readline-include was given.
++if test "${with_readline_include+set}" = set; then
++  withval="$with_readline_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-readline-include" >&2; exit 1; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi;
++
++echo "configure:10790: checking for readline" >&5
++echo $ECHO_N "checking for readline... $ECHO_C" >&6
++
++case "$with_readline" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_readline_include" = ""; then
++		with_readline_include="$with_readline/include"
++	fi
++	if test "$with_readline_lib" = ""; then
++		with_readline_lib="$with_readline/lib$abilibdirext"
++	fi
++	;;
++esac
++header_dirs=
++lib_dirs=
++d=''
++for i in $d /usr; do
++	header_dirs="$header_dirs $i/include"
++	lib_dirs="$lib_dirs $i/lib$abilibdirext"
++done
++
++case "$with_readline_include" in
++yes) ;;
++no)  ;;
++*)   header_dirs="$with_readline_include $header_dirs";;
++esac
++case "$with_readline_lib" in
++yes) ;;
++no)  ;;
++*)   lib_dirs="$with_readline_lib $lib_dirs";;
++esac
++
++save_CFLAGS="$CFLAGS"
++save_LIBS="$LIBS"
++ires= lres=
++for i in $header_dirs; do
++	CFLAGS="-I$i $save_CFLAGS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 10830 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10843: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ires=$i;break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++for i in $lib_dirs; do
++	LIBS="-L$i -lreadline  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 10854 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10867: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lres=$i;break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++done
++CFLAGS="$save_CFLAGS"
++LIBS="$save_LIBS"
++
++if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
++	readline_includedir="$ires"
++	readline_libdir="$lres"
++	DIR_readline=
++	INCLUDE_readline="-I$readline_includedir"
++	LIB_readline="-L$readline_libdir -lreadline"
++	
++cat >>confdefs.h <<EOF
++#define READLINE 1
++EOF
++
++	with_readline=yes
++	echo "configure:10890: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++else
++	DIR_readline="readline"
++	INCLUDE_readline=
++	LIB_readline=
++	with_readline=no
++	echo "configure:10897: result: $with_readline" >&5
++echo "${ECHO_T}$with_readline" >&6
++fi
++
++# Check whether --with-com_err or --without-com_err was given.
++if test "${with_com_err+set}" = set; then
++  withval="$with_com_err"
++
++fi;
++
++# Check whether --with-com_err-lib or --without-com_err-lib was given.
++if test "${with_com_err_lib+set}" = set; then
++  withval="$with_com_err_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-com_err-lib" >&2; exit 1; }
++elif test "X$with_com_err" = "X"; then
++  with_com_err=yes
++fi
++fi;
++
++# Check whether --with-com_err-include or --without-com_err-include was given.
++if test "${with_com_err_include+set}" = set; then
++  withval="$with_com_err_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-com_err-include" >&2; exit 1; }
++elif test "X$with_com_err" = "X"; then
++  with_com_err=yes
++fi
++fi;
+ 
+-if test "$CATMAN"; then
+-  CATMAN_TRUE=
+-  CATMAN_FALSE='#'
+-else
+-  CATMAN_TRUE='#'
+-  CATMAN_FALSE=
+-fi
+-echo "configure:9328: checking extension of pre-formatted manual pages" >&5
+-echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
+-if test "${ac_cv_sys_catman_ext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
+-	ac_cv_sys_catman_ext=0
++echo "configure:10927: checking for com_err" >&5
++echo $ECHO_N "checking for com_err... $ECHO_C" >&6
++
++case "$with_com_err" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_com_err_include" = ""; then
++		with_com_err_include="$with_com_err/include"
++	fi
++	if test "$with_com_err_lib" = ""; then
++		with_com_err_lib="$with_com_err/lib$abilibdirext"
++	fi
++	;;
++esac
++header_dirs=
++lib_dirs=
++d=''
++for i in $d /usr; do
++	header_dirs="$header_dirs $i/include"
++	lib_dirs="$lib_dirs $i/lib$abilibdirext"
++done
++
++case "$with_com_err_include" in
++yes) ;;
++no)  ;;
++*)   header_dirs="$with_com_err_include $header_dirs";;
++esac
++case "$with_com_err_lib" in
++yes) ;;
++no)  ;;
++*)   lib_dirs="$with_com_err_lib $lib_dirs";;
++esac
++
++save_CFLAGS="$CFLAGS"
++save_LIBS="$LIBS"
++ires= lres=
++for i in $header_dirs; do
++	CFLAGS="-I$i $save_CFLAGS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 10967 "configure"
++#include "confdefs.h"
++#include <et/com_err.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10979: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ires=$i;break
+ else
+-	ac_cv_sys_catman_ext=number
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++for i in $lib_dirs; do
++	LIBS="-L$i -lcom_err  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 10990 "configure"
++#include "confdefs.h"
++#include <et/com_err.h>
++int
++main ()
++{
+ 
+-fi
+-echo "configure:9339: result: $ac_cv_sys_catman_ext" >&5
+-echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
+-if test "$ac_cv_sys_catman_ext" = number; then
+-	CATMANEXT='$$ext'
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11002: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lres=$i;break
+ else
+-	CATMANEXT=0
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++done
++CFLAGS="$save_CFLAGS"
++LIBS="$save_LIBS"
+ 
+-# Check whether --with-readline or --without-readline was given.
+-if test "${with_readline+set}" = set; then
+-  withval="$with_readline"
++if test "$ires" -a "$lres" -a "$with_com_err" != "no"; then
++	com_err_includedir="$ires"
++	com_err_libdir="$lres"
++	DIR_com_err=
++	INCLUDE_com_err="-I$com_err_includedir"
++	LIB_com_err="-L$com_err_libdir -lcom_err"
++	
++cat >>confdefs.h <<EOF
++#define COM_ERR 1
++EOF
+ 
+-fi
+-# Check whether --with-readline-lib or --without-readline-lib was given.
+-if test "${with_readline_lib+set}" = set; then
+-  withval="$with_readline_lib"
++	with_com_err=yes
++	echo "configure:11025: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++else
++	DIR_com_err="com_err"
++	INCLUDE_com_err=
++	LIB_com_err=
++	with_com_err=no
++	echo "configure:11032: result: $with_com_err" >&5
++echo "${ECHO_T}$with_com_err" >&6
++fi
++
++# Check whether --with-ss or --without-ss was given.
++if test "${with_ss+set}" = set; then
++  withval="$with_ss"
++
++fi;
++
++# Check whether --with-ss-lib or --without-ss-lib was given.
++if test "${with_ss_lib+set}" = set; then
++  withval="$with_ss_lib"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { echo "configure: error: No argument for --with-readline-lib" >&2; exit 1; }
+-elif test "X$with_readline" = "X"; then
+-  with_readline=yes
+-fi
+-fi
+-# Check whether --with-readline-include or --without-readline-include was given.
+-if test "${with_readline_include+set}" = set; then
+-  withval="$with_readline_include"
++  { echo "configure: error: No argument for --with-ss-lib" >&2; exit 1; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
++fi
++fi;
++
++# Check whether --with-ss-include or --without-ss-include was given.
++if test "${with_ss_include+set}" = set; then
++  withval="$with_ss_include"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { echo "configure: error: No argument for --with-readline-include" >&2; exit 1; }
+-elif test "X$with_readline" = "X"; then
+-  with_readline=yes
+-fi
++  { echo "configure: error: No argument for --with-ss-include" >&2; exit 1; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
+ fi
++fi;
+ 
+-echo "configure:9368: checking for readline" >&5
+-echo $ECHO_N "checking for readline... $ECHO_C" >&6
++echo "configure:11062: checking for ss" >&5
++echo $ECHO_N "checking for ss... $ECHO_C" >&6
+ 
+-case "$with_readline" in
++case "$with_ss" in
+ yes)	;;
+ no)	;;
+ "")	;;
+-*)	if test "$with_readline_include" = ""; then
+-		with_readline_include="$with_readline/include"
++*)	if test "$with_ss_include" = ""; then
++		with_ss_include="$with_ss/include"
+ 	fi
+-	if test "$with_readline_lib" = ""; then
+-		with_readline_lib="$with_readline/lib$abilibdirext"
++	if test "$with_ss_lib" = ""; then
++		with_ss_lib="$with_ss/lib$abilibdirext"
+ 	fi
+ 	;;
+ esac
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+ 
+-case "$with_readline_include" in
++case "$with_ss_include" in
+ yes) ;;
+ no)  ;;
+-*)   header_dirs="$with_readline_include $header_dirs";;
++*)   header_dirs="$with_ss_include $header_dirs";;
+ esac
+-case "$with_readline_lib" in
++case "$with_ss_lib" in
+ yes) ;;
+ no)  ;;
+-*)   lib_dirs="$with_readline_lib $lib_dirs";;
++*)   lib_dirs="$with_ss_lib $lib_dirs";;
+ esac
+ 
+ save_CFLAGS="$CFLAGS"
+@@ -10425,11 +11098,10 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9405 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11102 "configure"
+ #include "confdefs.h"
+-#include <stdio.h>
+- #include <readline.h>
++#include <ss.h>
+ int
+ main ()
+ {
+@@ -10437,22 +11109,22 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9416: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11114: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+-	LIBS="-L$i -lreadline  $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9427 "configure"
++	LIBS="-L$i -lss  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11125 "configure"
+ #include "confdefs.h"
+-#include <stdio.h>
+- #include <readline.h>
++#include <ss.h>
+ int
+ main ()
+ {
+@@ -10460,44 +11132,48 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9438: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11137: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ 
+-if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
+-	readline_includedir="$ires"
+-	readline_libdir="$lres"
+-	INCLUDE_readline="-I$readline_includedir"
+-	LIB_readline="-L$readline_libdir -lreadline"
++if test "$ires" -a "$lres" -a "$with_ss" != "no"; then
++	ss_includedir="$ires"
++	ss_libdir="$lres"
++	DIR_ss=
++	INCLUDE_ss="-I$ss_includedir"
++	LIB_ss="-L$ss_libdir -lss"
+ 	
+ cat >>confdefs.h <<EOF
+-#define READLINE 1
++#define SS 1
+ EOF
+ 
+-	with_readline=yes
+-	echo "configure:9458: result: headers $ires, libraries $lres" >&5
++	with_ss=yes
++	echo "configure:11160: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
+-	INCLUDE_readline=
+-	LIB_readline=
+-	with_readline=no
+-	echo "configure:9464: result: $with_readline" >&5
+-echo "${ECHO_T}$with_readline" >&6
++	DIR_ss="ss"
++	INCLUDE_ss=
++	LIB_ss=
++	with_ss=no
++	echo "configure:11167: result: $with_ss" >&5
++echo "${ECHO_T}$with_ss" >&6
+ fi
+ 
+ # Check whether --with-hesiod or --without-hesiod was given.
+ if test "${with_hesiod+set}" = set; then
+   withval="$with_hesiod"
+ 
+-fi
++fi;
++
+ # Check whether --with-hesiod-lib or --without-hesiod-lib was given.
+ if test "${with_hesiod_lib+set}" = set; then
+   withval="$with_hesiod_lib"
+@@ -10506,7 +11182,8 @@
+ elif test "X$with_hesiod" = "X"; then
+   with_hesiod=yes
+ fi
+-fi
++fi;
++
+ # Check whether --with-hesiod-include or --without-hesiod-include was given.
+ if test "${with_hesiod_include+set}" = set; then
+   withval="$with_hesiod_include"
+@@ -10515,9 +11192,9 @@
+ elif test "X$with_hesiod" = "X"; then
+   with_hesiod=yes
+ fi
+-fi
++fi;
+ 
+-echo "configure:9489: checking for hesiod" >&5
++echo "configure:11197: checking for hesiod" >&5
+ echo $ECHO_N "checking for hesiod... $ECHO_C" >&6
+ 
+ case "$with_hesiod" in
+@@ -10535,7 +11212,7 @@
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -10556,8 +11233,8 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9526 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11237 "configure"
+ #include "confdefs.h"
+ #include <hesiod.h>
+ int
+@@ -10567,19 +11244,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9536: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11249: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lhesiod  $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9547 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11260 "configure"
+ #include "confdefs.h"
+ #include <hesiod.h>
+ int
+@@ -10589,14 +11267,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9557: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11272: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+@@ -10604,6 +11283,7 @@
+ if test "$ires" -a "$lres" -a "$with_hesiod" != "no"; then
+ 	hesiod_includedir="$ires"
+ 	hesiod_libdir="$lres"
++	DIR_hesiod=
+ 	INCLUDE_hesiod="-I$hesiod_includedir"
+ 	LIB_hesiod="-L$hesiod_libdir -lhesiod"
+ 	
+@@ -10612,13 +11292,14 @@
+ EOF
+ 
+ 	with_hesiod=yes
+-	echo "configure:9577: result: headers $ires, libraries $lres" >&5
++	echo "configure:11295: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_hesiod="hesiod"
+ 	INCLUDE_hesiod=
+ 	LIB_hesiod=
+ 	with_hesiod=no
+-	echo "configure:9583: result: $with_hesiod" >&5
++	echo "configure:11302: result: $with_hesiod" >&5
+ echo "${ECHO_T}$with_hesiod" >&6
+ fi
+ 
+@@ -10626,19 +11307,19 @@
+ if test "${enable_bigendian+set}" = set; then
+   enableval="$enable_bigendian"
+   krb_cv_c_bigendian=yes
+-fi
++fi;
+ # Check whether --enable-littleendian or --disable-littleendian was given.
+ if test "${enable_littleendian+set}" = set; then
+   enableval="$enable_littleendian"
+   krb_cv_c_bigendian=no
+-fi
+-echo "configure:9596: checking whether byte order is known at compile time" >&5
++fi;
++echo "configure:11316: checking whether byte order is known at compile time" >&5
+ echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
+ if test "${krb_cv_c_bigendian_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9602 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11322 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -10653,27 +11334,28 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9616: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11339: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   krb_cv_c_bigendian_compile=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   krb_cv_c_bigendian_compile=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:9625: result: $krb_cv_c_bigendian_compile" >&5
++echo "configure:11348: result: $krb_cv_c_bigendian_compile" >&5
+ echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
+-echo "configure:9627: checking whether byte ordering is bigendian" >&5
++echo "configure:11350: checking whether byte ordering is bigendian" >&5
+ echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+ if test "${krb_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+   if test "$krb_cv_c_bigendian_compile" = "yes"; then
+-    cat >conftest.$ac_ext <<EOF
+-#line 9634 "configure"
++    cat >conftest.$ac_ext <<_ACEOF
++#line 11358 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -10688,21 +11370,22 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9648: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11375: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   krb_cv_c_bigendian=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   krb_cv_c_bigendian=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+   else
+     if test "$cross_compiling" = yes; then
+   { echo "configure: error: specify either --enable-bigendian or --enable-littleendian" >&2; exit 1; }
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9661 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11388 "configure"
+ #include "confdefs.h"
+ main () {
+       /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -10714,22 +11397,23 @@
+     u.l = 1;
+     exit (u.c[sizeof (long) - 1] == 1);
+   }
+-EOF
+-if { (eval echo configure:9674: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:11402: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   krb_cv_c_bigendian=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   krb_cv_c_bigendian=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+   fi
+ 
+ fi
+-echo "configure:9686: result: $krb_cv_c_bigendian" >&5
++echo "configure:11416: result: $krb_cv_c_bigendian" >&5
+ echo "${ECHO_T}$krb_cv_c_bigendian" >&6
+ if test "$krb_cv_c_bigendian" = "yes"; then
+ 
+@@ -10744,32 +11428,33 @@
+ EOF
+ fi
+ 
+-echo "configure:9698: checking for inline" >&5
++echo "configure:11431: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<EOF
+-#line 9706 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11439 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ $ac_kw int foo () {return 0; }
+ #endif
+ 
+-EOF
+-if { (eval echo configure:9712: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11447: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+-echo "configure:9721: result: $ac_cv_c_inline" >&5
++echo "configure:11457: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -10809,7 +11494,7 @@
+   AIX_DYNAMIC_AFS_FALSE=
+ fi
+ 
+-echo "configure:9757: checking for dlopen" >&5
++echo "configure:11497: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10824,8 +11509,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 9772 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 11513 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10835,14 +11520,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9782: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11525: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dlopen=$ac_lib; else ac_cv_funclib_dlopen=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dlopen=\${ac_cv_funclib_dlopen-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -10857,13 +11543,13 @@
+ for ac_func in dlopen
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:9800: checking for $ac_func" >&5
++echo "configure:11546: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9806 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11552 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -10892,17 +11578,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9834: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11583: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:9843: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:11592: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -10926,13 +11613,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:9863: result: yes" >&5
++	echo "configure:11616: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dlopen=no"
+ 	eval "LIB_dlopen="
+-	echo "configure:9869: result: no" >&5
++	echo "configure:11622: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -10946,7 +11633,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:9881: result: yes, in $ac_res" >&5
++	echo "configure:11636: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -10973,14 +11660,14 @@
+   HAVE_DLOPEN_FALSE=
+ fi
+ 
+-echo "configure:9905: checking for X" >&5
++echo "configure:11663: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+   withval="$with_x"
+ 
+-fi
++fi;
+ # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+ if test "x$with_x" = xno; then
+   # The user explicitly disabled X.
+@@ -11069,19 +11756,27 @@
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+-  cat >conftest.$ac_ext <<EOF
+-#line 9992 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11760 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:9997: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:11765: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   for ac_dir in $ac_x_header_dirs; do
+@@ -11092,6 +11787,7 @@
+ done
+ fi
+ rm -f conftest*
++
+ fi # $ac_x_includes = no
+ 
+ if test "$ac_x_libraries" = no; then
+@@ -11100,8 +11796,8 @@
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+-  cat >conftest.$ac_ext <<EOF
+-#line 10022 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11800 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -11111,8 +11807,9 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10033: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11812: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -11131,7 +11828,7 @@
+   done
+ done
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = no
+ 
+ if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+@@ -11148,7 +11845,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "configure:10067: result: $have_x" >&5
++  echo "configure:11848: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -11158,7 +11855,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "configure:10077: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "configure:11858: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -11182,43 +11879,39 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "configure:10097: checking whether -R must be followed by a space" >&5
++      echo "configure:11882: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+-      cat >conftest.$ac_ext <<EOF
+-
+-EOF
+-if { (eval echo configure:10102: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++      rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11886: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_R_nospace=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_R_nospace=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext
+       if test $ac_R_nospace = yes; then
+-	echo "configure:10111: result: no" >&5
++	echo "configure:11895: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+-	cat >conftest.$ac_ext <<EOF
+-
+-EOF
+-if { (eval echo configure:10118: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++	rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11901: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_R_space=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_R_space=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext
+ 	if test $ac_R_space = yes; then
+-	  echo "configure:10127: result: yes" >&5
++	  echo "configure:11910: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "configure:10131: result: neither works" >&5
++	  echo "configure:11914: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -11237,19 +11930,15 @@
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10151: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:11933: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10159 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 11941 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11266,18 +11955,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10176: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11960: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10186: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "configure:11970: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+@@ -11285,19 +11975,15 @@
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10196: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:11978: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10204 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 11986 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11314,18 +12000,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10221: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12005: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10231: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "configure:12015: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -11341,13 +12028,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "configure:10245: checking for gethostbyname" >&5
++    echo "configure:12031: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10251 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12037 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -11376,34 +12063,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10279: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12068: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_gethostbyname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_gethostbyname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10288: result: $ac_cv_func_gethostbyname" >&5
++echo "configure:12077: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10295: checking for gethostbyname in -lnsl" >&5
++echo "configure:12082: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10303 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12090 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11420,18 +12104,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10320: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12109: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_nsl_gethostbyname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10330: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "configure:12119: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+@@ -11439,19 +12124,15 @@
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10340: checking for gethostbyname in -lbsd" >&5
++echo "configure:12127: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10348 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12135 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11468,18 +12149,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10365: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12154: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_bsd_gethostbyname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10375: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "configure:12164: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -11495,13 +12177,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "configure:10389: checking for connect" >&5
++    echo "configure:12180: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10395 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12186 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -11530,34 +12212,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10423: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12217: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_connect=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_connect=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10432: result: $ac_cv_func_connect" >&5
++echo "configure:12226: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10439: checking for connect in -lsocket" >&5
++echo "configure:12231: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10447 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12239 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11574,18 +12253,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10464: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12258: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_socket_connect=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_socket_connect=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10474: result: $ac_cv_lib_socket_connect" >&5
++echo "configure:12268: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -11594,13 +12274,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "configure:10481: checking for remove" >&5
++    echo "configure:12277: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10487 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12283 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -11629,34 +12309,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10515: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12314: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_remove=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_remove=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10524: result: $ac_cv_func_remove" >&5
++echo "configure:12323: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10531: checking for remove in -lposix" >&5
++echo "configure:12328: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10539 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12336 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11673,18 +12350,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10556: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12355: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_posix_remove=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_posix_remove=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10566: result: $ac_cv_lib_posix_remove" >&5
++echo "configure:12365: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -11693,13 +12371,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "configure:10573: checking for shmat" >&5
++    echo "configure:12374: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10579 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12380 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -11728,34 +12406,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10607: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12411: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_shmat=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_shmat=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10616: result: $ac_cv_func_shmat" >&5
++echo "configure:12420: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10623: checking for shmat in -lipc" >&5
++echo "configure:12425: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10631 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12433 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11772,18 +12447,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10648: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12452: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ipc_shmat=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10658: result: $ac_cv_lib_ipc_shmat" >&5
++echo "configure:12462: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -11802,19 +12478,15 @@
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10678: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:12481: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10686 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12489 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11831,18 +12503,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10703: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12508: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10713: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "configure:12518: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -11855,7 +12528,7 @@
+ # try to figure out if we need any additional ld flags, like -R
+ # and yes, the autoconf X test is utterly broken
+ if test "$no_x" != yes; then
+-	echo "configure:10723: checking for special X linker flags" >&5
++	echo "configure:12531: checking for special X linker flags" >&5
+ echo $ECHO_N "checking for special X linker flags... $ECHO_C" >&6
+ if test "${krb_cv_sys_x_libs_rpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11886,8 +12559,8 @@
+ 		if test "$cross_compiling" = yes; then
+   { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10754 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12563 "configure"
+ #include "confdefs.h"
+ 
+ 		#include <X11/Xlib.h>
+@@ -11900,16 +12573,17 @@
+ 		return 0;
+ 		}
+ 		
+-EOF
+-if { (eval echo configure:10767: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:12578: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   :
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ 	done
+@@ -11917,7 +12591,7 @@
+ 	CFLAGS="$ac_save_cflags"
+ 	
+ fi
+-echo "configure:10782: result: $krb_cv_sys_x_libs_rpath" >&5
++echo "configure:12594: result: $krb_cv_sys_x_libs_rpath" >&5
+ echo "${ECHO_T}$krb_cv_sys_x_libs_rpath" >&6
+ 	X_LIBS="$krb_cv_sys_x_libs"
+ fi
+@@ -11937,7 +12611,7 @@
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+-echo "configure:10799: checking for XauWriteAuth" >&5
++echo "configure:12614: checking for XauWriteAuth" >&5
+ echo $ECHO_N "checking for XauWriteAuth... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauWriteAuth+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11952,8 +12626,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 10814 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 12630 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11963,14 +12637,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10824: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12642: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauWriteAuth=$ac_lib; else ac_cv_funclib_XauWriteAuth=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_XauWriteAuth=\${ac_cv_funclib_XauWriteAuth-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -11985,13 +12660,13 @@
+ for ac_func in XauWriteAuth
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:10842: checking for $ac_func" >&5
++echo "configure:12663: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10848 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12669 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12020,17 +12695,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10876: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12700: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10885: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:12709: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12054,13 +12730,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:10905: result: yes" >&5
++	echo "configure:12733: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauWriteAuth=no"
+ 	eval "LIB_XauWriteAuth="
+-	echo "configure:10911: result: no" >&5
++	echo "configure:12739: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12074,7 +12750,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:10923: result: yes, in $ac_res" >&5
++	echo "configure:12753: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12082,7 +12758,7 @@
+ ac_xxx="$LIBS"
+ LIBS="$LIB_XauWriteAuth $LIBS"
+ 
+-echo "configure:10929: checking for XauReadAuth" >&5
++echo "configure:12761: checking for XauReadAuth" >&5
+ echo $ECHO_N "checking for XauReadAuth... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauReadAuth+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12097,8 +12773,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 10944 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 12777 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12108,14 +12784,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10954: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12789: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauReadAuth=$ac_lib; else ac_cv_funclib_XauReadAuth=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_XauReadAuth=\${ac_cv_funclib_XauReadAuth-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -12130,13 +12807,13 @@
+ for ac_func in XauReadAuth
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:10972: checking for $ac_func" >&5
++echo "configure:12810: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10978 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12816 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12165,17 +12842,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11006: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12847: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:11015: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:12856: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12199,13 +12877,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:11035: result: yes" >&5
++	echo "configure:12880: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauReadAuth=no"
+ 	eval "LIB_XauReadAuth="
+-	echo "configure:11041: result: no" >&5
++	echo "configure:12886: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12219,14 +12897,14 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:11053: result: yes, in $ac_res" >&5
++	echo "configure:12900: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ LIBS="$LIB_XauReadAauth $LIBS"
+ 
+-echo "configure:11058: checking for XauFileName" >&5
++echo "configure:12907: checking for XauFileName" >&5
+ echo $ECHO_N "checking for XauFileName... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauFileName+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12241,8 +12919,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 11073 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 12923 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12252,14 +12930,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11083: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12935: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauFileName=$ac_lib; else ac_cv_funclib_XauFileName=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_XauFileName=\${ac_cv_funclib_XauFileName-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -12274,13 +12953,13 @@
+ for ac_func in XauFileName
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:11101: checking for $ac_func" >&5
++echo "configure:12956: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11107 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12962 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12309,17 +12988,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11135: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12993: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:11144: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:13002: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12343,13 +13023,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:11164: result: yes" >&5
++	echo "configure:13026: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauFileName=no"
+ 	eval "LIB_XauFileName="
+-	echo "configure:11170: result: no" >&5
++	echo "configure:13032: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12363,7 +13043,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:11182: result: yes, in $ac_res" >&5
++	echo "configure:13046: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12414,13 +13094,13 @@
+ LIBS=$save_LIBS
+ LDFLAGS=$save_LDFLAGS
+ 
+-echo "configure:11228: checking for an ANSI C-conforming const" >&5
++echo "configure:13097: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11234 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13103 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12476,17 +13156,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11288: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13161: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_c_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11297: result: $ac_cv_c_const" >&5
++echo "configure:13170: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -12496,13 +13177,13 @@
+ 
+ fi
+ 
+-echo "configure:11304: checking for off_t" >&5
++echo "configure:13180: checking for off_t" >&5
+ echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+ if test "${ac_cv_type_off_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11310 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13186 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12515,17 +13196,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11324: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13201: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_off_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_off_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11333: result: $ac_cv_type_off_t" >&5
++echo "configure:13210: result: $ac_cv_type_off_t" >&5
+ echo "${ECHO_T}$ac_cv_type_off_t" >&6
+ if test $ac_cv_type_off_t = yes; then
+   :
+@@ -12537,13 +13219,13 @@
+ 
+ fi
+ 
+-echo "configure:11342: checking for size_t" >&5
++echo "configure:13222: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11348 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13228 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12556,17 +13238,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11362: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13243: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_size_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11371: result: $ac_cv_type_size_t" >&5
++echo "configure:13252: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -12578,13 +13261,13 @@
+ 
+ fi
+ 
+-echo "configure:11380: checking for ssize_t" >&5
++echo "configure:13264: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11386 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13270 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12592,7 +13275,7 @@
+ #include <stddef.h>
+ #endif
+ #include <unistd.h>
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_ssize_t=yes
+@@ -12602,7 +13285,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11403: result: $ac_cv_type_ssize_t" >&5
++echo "configure:13288: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = no; then
+ 
+@@ -12612,13 +13295,13 @@
+ 
+ fi
+ 
+-echo "configure:11410: checking for pid_t" >&5
++echo "configure:13298: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11416 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13304 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12631,17 +13314,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11430: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13319: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_pid_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11439: result: $ac_cv_type_pid_t" >&5
++echo "configure:13328: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -12653,17 +13337,17 @@
+ 
+ fi
+ 
+-echo "configure:11448: checking for uid_t in sys/types.h" >&5
++echo "configure:13340: checking for uid_t in sys/types.h" >&5
+ echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11454 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13346 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "uid_t" >/dev/null 2>&1; then
+   ac_cv_type_uid_t=yes
+@@ -12673,7 +13357,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11466: result: $ac_cv_type_uid_t" >&5
++echo "configure:13360: result: $ac_cv_type_uid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+ if test $ac_cv_type_uid_t = no; then
+ 
+@@ -12687,13 +13371,13 @@
+ 
+ fi
+ 
+-echo "configure:11476: checking for mode_t" >&5
++echo "configure:13374: checking for mode_t" >&5
+ echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+ if test "${ac_cv_type_mode_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11482 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13380 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12701,7 +13385,7 @@
+ #include <stddef.h>
+ #endif
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_mode_t=yes
+@@ -12711,7 +13395,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11498: result: $ac_cv_type_mode_t" >&5
++echo "configure:13398: result: $ac_cv_type_mode_t" >&5
+ echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+ if test $ac_cv_type_mode_t = no; then
+ 
+@@ -12721,13 +13405,13 @@
+ 
+ fi
+ 
+-echo "configure:11505: checking for sig_atomic_t" >&5
++echo "configure:13408: checking for sig_atomic_t" >&5
+ echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11511 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13414 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12735,7 +13419,7 @@
+ #include <stddef.h>
+ #endif
+ #include <signal.h>
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "sig_atomic_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_sig_atomic_t=yes
+@@ -12745,7 +13429,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11528: result: $ac_cv_type_sig_atomic_t" >&5
++echo "configure:13432: result: $ac_cv_type_sig_atomic_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
+ if test $ac_cv_type_sig_atomic_t = no; then
+ 
+@@ -12756,13 +13440,13 @@
+ fi
+ 
+ cv=`echo "long long" | sed 'y%./+- %__p__%'`
+-echo "configure:11536: checking for long long" >&5
++echo "configure:13443: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11542 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13449 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12777,29 +13461,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11557: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13466: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:11567: result: $ac_foo" >&5
++echo "configure:13476: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:11572: checking for long long" >&5
++	echo "configure:13481: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11578 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13487 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12812,17 +13497,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11592: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13502: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_long_long=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_long_long=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11601: result: $ac_cv_type_long_long" >&5
++echo "configure:13511: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+ 
+@@ -12840,13 +13526,13 @@
+ 
+ fi
+ 
+-echo "configure:11613: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:13529: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11619 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13535 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -12859,17 +13545,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11632: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13550: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_time=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11641: result: $ac_cv_header_time" >&5
++echo "configure:13559: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -12879,13 +13566,13 @@
+ 
+ fi
+ 
+-echo "configure:11648: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:13569: checking whether struct tm is in sys/time.h or time.h" >&5
+ echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+ if test "${ac_cv_struct_tm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11654 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13575 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -12897,17 +13584,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11666: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13589: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_tm=time.h
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_struct_tm=sys/time.h
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11675: result: $ac_cv_struct_tm" >&5
++echo "configure:13598: result: $ac_cv_struct_tm" >&5
+ echo "${ECHO_T}$ac_cv_struct_tm" >&6
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+@@ -12917,27 +13605,35 @@
+ 
+ fi
+ 
+-echo "configure:11682: checking for ANSI C header files" >&5
++echo "configure:13608: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11688 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13614 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11696: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:13623: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+@@ -12946,12 +13642,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 11710 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13646 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "memchr" >/dev/null 2>&1; then
+   :
+@@ -12964,12 +13660,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 11725 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13664 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "free" >/dev/null 2>&1; then
+   :
+@@ -12985,8 +13681,8 @@
+   if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11743 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13685 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13010,21 +13706,22 @@
+       exit(2);
+   exit (0);
+ }
+-EOF
+-if { (eval echo configure:11767: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:13711: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+ fi
+-echo "configure:11779: result: $ac_cv_header_stdc" >&5
++echo "configure:13724: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -13127,35 +13824,41 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:11882: checking for $ac_header" >&5
++
++echo "configure:13828: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11888 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13834 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11893: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:13840: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:11905: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:13861: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13168,35 +13871,41 @@
+ for ac_header in standards.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:11920: checking for $ac_header" >&5
++
++echo "configure:13875: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11926 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13881 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11931: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:13887: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:11943: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:13908: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13210,13 +13919,13 @@
+ 
+ cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-echo "configure:11953: checking for $i" >&5
++echo "configure:13922: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11959 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13928 "configure"
+ #include "confdefs.h"
+ \
+ #ifdef HAVE_STANDARDS_H
+@@ -13224,21 +13933,30 @@
+ #endif
+ #include <$i>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11968: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:13938: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "ac_cv_header_$cv=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_header_$cv=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:11980: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "configure:13959: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
+ ac_res=`eval echo \\$ac_cv_header_$cv`
+ if test "$ac_res" = yes; then
+@@ -13255,35 +13973,41 @@
+ for ac_header in netinet/ip.h netinet/tcp.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:11999: checking for $ac_header" >&5
++
++echo "configure:13977: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12005 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13983 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12010: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:13989: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:12022: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:14010: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13299,7 +14023,7 @@
+ if test "${enable_netinfo+set}" = set; then
+   enableval="$enable_netinfo"
+ 
+-fi
++fi;
+ 
+ if test "$ac_cv_header_netinfo_ni_h" = yes -a "$enable_netinfo" = yes; then
+ 
+@@ -13332,27 +14056,27 @@
+ if test "$withval" = "no"; then
+ 	ac_cv_lib_ipv6=no
+ fi
+-fi
++fi;
+ if test "${ac_cv_lib_ipv6+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   v6type=unknown
+ v6lib=none
+ 
+-echo "configure:12066: checking ipv6 stack type" >&5
++echo "configure:14066: checking ipv6 stack type" >&5
+ echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
+ for i in v6d toshiba kame inria zeta linux; do
+ 	case $i in
+ 	v6d)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12072 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14072 "configure"
+ #include "confdefs.h"
+ dnl
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=v6;
+@@ -13363,15 +14087,15 @@
+ 
+ 		;;
+ 	toshiba)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12090 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14091 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -13382,15 +14106,15 @@
+ 
+ 		;;
+ 	kame)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12108 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14110 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -13401,15 +14125,15 @@
+ 
+ 		;;
+ 	inria)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12126 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14129 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; CFLAGS="-DINET6 $CFLAGS"
+@@ -13418,15 +14142,15 @@
+ 
+ 		;;
+ 	zeta)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12142 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14146 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -13449,7 +14173,7 @@
+ 		break
+ 	fi
+ done
+-echo "configure:12171: result: $v6type" >&5
++echo "configure:14176: result: $v6type" >&5
+ echo "${ECHO_T}$v6type" >&6
+ 
+ if test "$v6lib" != "none"; then
+@@ -13460,8 +14184,8 @@
+ 		fi
+ 	done
+ fi
+-cat >conftest.$ac_ext <<EOF
+-#line 12182 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 14188 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -13494,20 +14218,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12210: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14223: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipv6=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ipv6=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "configure:12219: checking for IPv6" >&5
++echo "configure:14233: checking for IPv6" >&5
+ echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
+-echo "configure:12221: result: $ac_cv_lib_ipv6" >&5
++echo "configure:14235: result: $ac_cv_lib_ipv6" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 
+@@ -13517,7 +14242,7 @@
+ 
+ fi
+ 
+-echo "configure:12228: checking for socket" >&5
++echo "configure:14245: checking for socket" >&5
+ echo $ECHO_N "checking for socket... $ECHO_C" >&6
+ if test "${ac_cv_funclib_socket+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13532,8 +14257,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12243 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14261 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13543,14 +14268,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12253: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14273: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -13565,13 +14291,13 @@
+ for ac_func in socket
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12271: checking for $ac_func" >&5
++echo "configure:14294: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12277 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14300 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -13600,17 +14326,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12305: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14331: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12314: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14340: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13634,13 +14361,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12334: result: yes" >&5
++	echo "configure:14364: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_socket=no"
+ 	eval "LIB_socket="
+-	echo "configure:12340: result: no" >&5
++	echo "configure:14370: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -13654,7 +14381,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12352: result: yes, in $ac_res" >&5
++	echo "configure:14384: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -13663,7 +14390,7 @@
+ 	LIBS="$LIB_socket $LIBS"
+ fi
+ 
+-echo "configure:12359: checking for gethostbyname" >&5
++echo "configure:14393: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13678,8 +14405,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12374 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14409 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13689,14 +14416,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12384: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14421: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -13711,13 +14439,13 @@
+ for ac_func in gethostbyname
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12402: checking for $ac_func" >&5
++echo "configure:14442: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12408 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14448 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -13746,17 +14474,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12436: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14479: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12445: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14488: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13780,13 +14509,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12465: result: yes" >&5
++	echo "configure:14512: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname=no"
+ 	eval "LIB_gethostbyname="
+-	echo "configure:12471: result: no" >&5
++	echo "configure:14518: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -13800,7 +14529,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12483: result: yes, in $ac_res" >&5
++	echo "configure:14532: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -13809,7 +14538,7 @@
+ 	LIBS="$LIB_gethostbyname $LIBS"
+ fi
+ 
+-echo "configure:12490: checking for syslog" >&5
++echo "configure:14541: checking for syslog" >&5
+ echo $ECHO_N "checking for syslog... $ECHO_C" >&6
+ if test "${ac_cv_funclib_syslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13824,8 +14553,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12505 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14557 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13835,14 +14564,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12515: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14569: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -13857,13 +14587,13 @@
+ for ac_func in syslog
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12533: checking for $ac_func" >&5
++echo "configure:14590: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12539 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14596 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -13892,17 +14622,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12567: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14627: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12576: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14636: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13926,13 +14657,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12596: result: yes" >&5
++	echo "configure:14660: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_syslog=no"
+ 	eval "LIB_syslog="
+-	echo "configure:12602: result: no" >&5
++	echo "configure:14666: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -13946,7 +14677,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12614: result: yes, in $ac_res" >&5
++	echo "configure:14680: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -13955,7 +14686,7 @@
+ 	LIBS="$LIB_syslog $LIBS"
+ fi
+ 
+-echo "configure:12621: checking for logwtmp" >&5
++echo "configure:14689: checking for logwtmp" >&5
+ echo $ECHO_N "checking for logwtmp... $ECHO_C" >&6
+ if test "${ac_cv_funclib_logwtmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13970,8 +14701,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12636 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14705 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13981,14 +14712,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12646: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14717: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_logwtmp=$ac_lib; else ac_cv_funclib_logwtmp=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_logwtmp=\${ac_cv_funclib_logwtmp-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14003,13 +14735,13 @@
+ for ac_func in logwtmp
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12664: checking for $ac_func" >&5
++echo "configure:14738: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12670 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14744 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14038,17 +14770,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12698: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14775: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12707: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14784: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14072,13 +14805,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12727: result: yes" >&5
++	echo "configure:14808: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_logwtmp=no"
+ 	eval "LIB_logwtmp="
+-	echo "configure:12733: result: no" >&5
++	echo "configure:14814: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14092,12 +14825,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12745: result: yes, in $ac_res" >&5
++	echo "configure:14828: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:12749: checking for tgetent" >&5
++echo "configure:14833: checking for tgetent" >&5
+ echo $ECHO_N "checking for tgetent... $ECHO_C" >&6
+ if test "${ac_cv_funclib_tgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14112,8 +14845,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12764 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14849 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14123,14 +14856,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12774: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14861: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_tgetent=$ac_lib; else ac_cv_funclib_tgetent=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_tgetent=\${ac_cv_funclib_tgetent-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14145,13 +14879,13 @@
+ for ac_func in tgetent
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12792: checking for $ac_func" >&5
++echo "configure:14882: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12798 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14888 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14180,17 +14914,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12826: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14919: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12835: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14928: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14214,13 +14949,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12855: result: yes" >&5
++	echo "configure:14952: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_tgetent=no"
+ 	eval "LIB_tgetent="
+-	echo "configure:12861: result: no" >&5
++	echo "configure:14958: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14234,12 +14969,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12873: result: yes, in $ac_res" >&5
++	echo "configure:14972: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:12877: checking for gethostbyname2" >&5
++echo "configure:14977: checking for gethostbyname2" >&5
+ echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14254,8 +14989,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12892 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14993 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14265,14 +15000,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12902: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15005: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14287,13 +15023,13 @@
+ for ac_func in gethostbyname2
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12920: checking for $ac_func" >&5
++echo "configure:15026: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12926 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15032 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14322,17 +15058,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12954: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15063: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12963: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15072: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14356,13 +15093,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12983: result: yes" >&5
++	echo "configure:15096: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname2=no"
+ 	eval "LIB_gethostbyname2="
+-	echo "configure:12989: result: no" >&5
++	echo "configure:15102: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14376,7 +15113,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13001: result: yes, in $ac_res" >&5
++	echo "configure:15116: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14385,7 +15122,7 @@
+ 	LIBS="$LIB_gethostbyname2 $LIBS"
+ fi
+ 
+-echo "configure:13008: checking for res_search" >&5
++echo "configure:15125: checking for res_search" >&5
+ echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+ if test "${ac_cv_funclib_res_search+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14400,8 +15137,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13023 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15141 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14425,14 +15162,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13046: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15167: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14447,13 +15185,13 @@
+ for ac_func in res_search
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13064: checking for $ac_func" >&5
++echo "configure:15188: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13070 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15194 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14482,17 +15220,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13098: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15225: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13107: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15234: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14516,13 +15255,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13127: result: yes" >&5
++	echo "configure:15258: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_search=no"
+ 	eval "LIB_res_search="
+-	echo "configure:13133: result: no" >&5
++	echo "configure:15264: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14536,7 +15275,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13145: result: yes, in $ac_res" >&5
++	echo "configure:15278: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14545,7 +15284,7 @@
+ 	LIBS="$LIB_res_search $LIBS"
+ fi
+ 
+-echo "configure:13152: checking for dn_expand" >&5
++echo "configure:15287: checking for dn_expand" >&5
+ echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14560,8 +15299,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13167 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15303 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14585,14 +15324,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13190: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15329: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14607,13 +15347,13 @@
+ for ac_func in dn_expand
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13208: checking for $ac_func" >&5
++echo "configure:15350: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13214 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15356 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14642,17 +15382,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13242: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15387: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13251: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15396: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14676,13 +15417,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13271: result: yes" >&5
++	echo "configure:15420: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dn_expand=no"
+ 	eval "LIB_dn_expand="
+-	echo "configure:13277: result: no" >&5
++	echo "configure:15426: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14696,7 +15437,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13289: result: yes, in $ac_res" >&5
++	echo "configure:15440: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14705,7 +15446,7 @@
+ 	LIBS="$LIB_dn_expand $LIBS"
+ fi
+ 
+-echo "configure:13296: checking for working snprintf" >&5
++echo "configure:15449: checking for working snprintf" >&5
+ echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14714,8 +15455,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13306 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15459 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14726,20 +15467,21 @@
+ 	snprintf(foo, 2, "12");
+ 	return strcmp(foo, "1");
+ }
+-EOF
+-if { (eval echo configure:13317: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:15472: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_snprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:13328: result: $ac_cv_func_snprintf_working" >&5
++echo "configure:15484: result: $ac_cv_func_snprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
+ 
+ if test "$ac_cv_func_snprintf_working" = yes; then
+@@ -14752,13 +15494,13 @@
+ if test "$ac_cv_func_snprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
+-echo "configure:13338: checking if snprintf needs a prototype" >&5
++echo "configure:15497: checking if snprintf needs a prototype" >&5
+ echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13344 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15503 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14771,17 +15513,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13357: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:15518: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_snprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_snprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:13366: result: $ac_cv_func_snprintf_noproto" >&5
++echo "configure:15527: result: $ac_cv_func_snprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_snprintf_noproto" = yes; then
+@@ -14796,7 +15539,7 @@
+ 
+ fi
+ 
+-echo "configure:13376: checking for working vsnprintf" >&5
++echo "configure:15542: checking for working vsnprintf" >&5
+ echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14805,8 +15548,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13386 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15552 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14827,20 +15570,21 @@
+ {
+ 	return foo(0, "12");
+ }
+-EOF
+-if { (eval echo configure:13405: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:15575: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_vsnprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:13416: result: $ac_cv_func_vsnprintf_working" >&5
++echo "configure:15587: result: $ac_cv_func_vsnprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+@@ -14853,13 +15597,13 @@
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
+-echo "configure:13426: checking if vsnprintf needs a prototype" >&5
++echo "configure:15600: checking if vsnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13432 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15606 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14872,17 +15616,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13445: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:15621: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vsnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vsnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:13454: result: $ac_cv_func_vsnprintf_noproto" >&5
++echo "configure:15630: result: $ac_cv_func_vsnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_noproto" = yes; then
+@@ -14932,13 +15677,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13498: checking for $ac_func" >&5
++echo "configure:15680: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13504 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15686 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14967,17 +15712,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13532: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15717: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13541: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15726: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14990,35 +15736,41 @@
+ for ac_header in capability.h sys/capability.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:13556: checking for $ac_header" >&5
++
++echo "configure:15740: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13562 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15746 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:13567: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:15752: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:13579: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:15773: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15031,13 +15783,13 @@
+ for ac_func in sgi_getcapabilitybyname cap_set_proc
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13590: checking for $ac_func" >&5
++echo "configure:15786: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13596 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15792 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15066,17 +15818,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13624: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15823: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13633: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15832: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15086,7 +15839,7 @@
+ fi
+ done
+ 
+-echo "configure:13641: checking for getpwnam_r" >&5
++echo "configure:15842: checking for getpwnam_r" >&5
+ echo $ECHO_N "checking for getpwnam_r... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getpwnam_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15101,8 +15854,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13656 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15858 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15112,14 +15865,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13666: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15870: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getpwnam_r=$ac_lib; else ac_cv_funclib_getpwnam_r=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_getpwnam_r=\${ac_cv_funclib_getpwnam_r-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -15134,13 +15888,13 @@
+ for ac_func in getpwnam_r
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13684: checking for $ac_func" >&5
++echo "configure:15891: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13690 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15897 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15169,17 +15923,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13718: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15928: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13727: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15937: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15203,13 +15958,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13747: result: yes" >&5
++	echo "configure:15961: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getpwnam_r=no"
+ 	eval "LIB_getpwnam_r="
+-	echo "configure:13753: result: no" >&5
++	echo "configure:15967: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15223,13 +15978,13 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13765: result: yes, in $ac_res" >&5
++	echo "configure:15981: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ if test "$ac_cv_func_getpwnam_r" = yes; then
+-	echo "configure:13770: checking if getpwnam_r is posix" >&5
++	echo "configure:15987: checking if getpwnam_r is posix" >&5
+ echo $ECHO_N "checking if getpwnam_r is posix... $ECHO_C" >&6
+ if test "${ac_cv_func_getpwnam_r_posix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15239,8 +15994,8 @@
+ 	if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13781 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15998 "configure"
+ #include "confdefs.h"
+ 
+ #include <pwd.h>
+@@ -15250,21 +16005,22 @@
+ 	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
+ }
+ 
+-EOF
+-if { (eval echo configure:13790: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:16010: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   ac_cv_func_getpwnam_r_posix=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getpwnam_r_posix=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ LIBS="$ac_libs"
+ fi
+-echo "configure:13802: result: $ac_cv_func_getpwnam_r_posix" >&5
++echo "configure:16023: result: $ac_cv_func_getpwnam_r_posix" >&5
+ echo "${ECHO_T}$ac_cv_func_getpwnam_r_posix" >&6
+ if test "$ac_cv_func_getpwnam_r_posix" = yes; then
+ 	
+@@ -15275,7 +16031,7 @@
+ fi
+ fi
+ 
+-echo "configure:13811: checking for getsockopt" >&5
++echo "configure:16034: checking for getsockopt" >&5
+ echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15290,8 +16046,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13826 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 16050 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -15306,14 +16062,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13842: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16067: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -15328,13 +16085,13 @@
+ for ac_func in getsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13860: checking for $ac_func" >&5
++echo "configure:16088: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13866 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16094 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15363,17 +16120,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13894: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16125: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13903: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16134: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15397,13 +16155,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13923: result: yes" >&5
++	echo "configure:16158: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getsockopt=no"
+ 	eval "LIB_getsockopt="
+-	echo "configure:13929: result: no" >&5
++	echo "configure:16164: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15417,12 +16175,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13941: result: yes, in $ac_res" >&5
++	echo "configure:16178: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:13945: checking for setsockopt" >&5
++echo "configure:16183: checking for setsockopt" >&5
+ echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_setsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15437,8 +16195,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13960 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 16199 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -15453,14 +16211,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13976: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16216: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -15475,13 +16234,13 @@
+ for ac_func in setsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13994: checking for $ac_func" >&5
++echo "configure:16237: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14000 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16243 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15510,17 +16269,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14028: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16274: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:14037: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16283: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15544,13 +16304,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:14057: result: yes" >&5
++	echo "configure:16307: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_setsockopt=no"
+ 	eval "LIB_setsockopt="
+-	echo "configure:14063: result: no" >&5
++	echo "configure:16313: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15564,7 +16324,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:14075: result: yes, in $ac_res" >&5
++	echo "configure:16327: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -15572,13 +16332,13 @@
+ for ac_func in getudbnam setlim
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:14082: checking for $ac_func" >&5
++echo "configure:16335: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14088 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16341 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15607,17 +16367,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14116: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16372: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:14125: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16381: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15627,13 +16388,13 @@
+ fi
+ done
+ 
+-echo "configure:14133: checking return type of signal handlers" >&5
++echo "configure:16391: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14139 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16397 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -15653,17 +16414,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14159: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16419: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=void
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_signal=int
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14168: result: $ac_cv_type_signal" >&5
++echo "configure:16428: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -15678,7 +16440,7 @@
+ 
+ fi
+ 
+-echo "configure:14179: checking if realloc if broken" >&5
++echo "configure:16443: checking if realloc if broken" >&5
+ echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
+ if test "${ac_cv_func_realloc_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15688,8 +16450,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14189 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16454 "configure"
+ #include "confdefs.h"
+ 
+ #include <stddef.h>
+@@ -15700,20 +16462,21 @@
+ 	return realloc(NULL, 17) == NULL;
+ }
+ 
+-EOF
+-if { (eval echo configure:14198: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:16467: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_realloc_broken=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:14209: result: $ac_cv_func_realloc_broken" >&5
++echo "configure:16479: result: $ac_cv_func_realloc_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
+ if test "$ac_cv_func_realloc_broken" = yes ; then
+ 	
+@@ -15723,14 +16486,14 @@
+ 
+ fi
+ 
+-echo "configure:14217: checking for ut_addr in struct utmp" >&5
++echo "configure:16489: checking for ut_addr in struct utmp" >&5
+ echo $ECHO_N "checking for ut_addr in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_addr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14223 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16496 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15740,17 +16503,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14234: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16508: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_addr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_addr=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14243: result: $ac_cv_type_struct_utmp_ut_addr" >&5
++echo "configure:16517: result: $ac_cv_type_struct_utmp_ut_addr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_addr" >&6
+ if test "$ac_cv_type_struct_utmp_ut_addr" = yes; then
+ 	
+@@ -15762,14 +16526,14 @@
+ 	
+ fi
+ 
+-echo "configure:14253: checking for ut_host in struct utmp" >&5
++echo "configure:16529: checking for ut_host in struct utmp" >&5
+ echo $ECHO_N "checking for ut_host in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14259 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16536 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15779,17 +16543,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14270: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16548: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_host=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_host=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14279: result: $ac_cv_type_struct_utmp_ut_host" >&5
++echo "configure:16557: result: $ac_cv_type_struct_utmp_ut_host" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_host" >&6
+ if test "$ac_cv_type_struct_utmp_ut_host" = yes; then
+ 	
+@@ -15801,14 +16566,14 @@
+ 	
+ fi
+ 
+-echo "configure:14289: checking for ut_id in struct utmp" >&5
++echo "configure:16569: checking for ut_id in struct utmp" >&5
+ echo $ECHO_N "checking for ut_id in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_id+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14295 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16576 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15818,17 +16583,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14306: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16588: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_id=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_id=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14315: result: $ac_cv_type_struct_utmp_ut_id" >&5
++echo "configure:16597: result: $ac_cv_type_struct_utmp_ut_id" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_id" >&6
+ if test "$ac_cv_type_struct_utmp_ut_id" = yes; then
+ 	
+@@ -15840,14 +16606,14 @@
+ 	
+ fi
+ 
+-echo "configure:14325: checking for ut_pid in struct utmp" >&5
++echo "configure:16609: checking for ut_pid in struct utmp" >&5
+ echo $ECHO_N "checking for ut_pid in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_pid+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14331 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16616 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15857,17 +16623,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14342: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16628: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_pid=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_pid=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14351: result: $ac_cv_type_struct_utmp_ut_pid" >&5
++echo "configure:16637: result: $ac_cv_type_struct_utmp_ut_pid" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_pid" >&6
+ if test "$ac_cv_type_struct_utmp_ut_pid" = yes; then
+ 	
+@@ -15879,14 +16646,14 @@
+ 	
+ fi
+ 
+-echo "configure:14361: checking for ut_type in struct utmp" >&5
++echo "configure:16649: checking for ut_type in struct utmp" >&5
+ echo $ECHO_N "checking for ut_type in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14367 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16656 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15896,17 +16663,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14378: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16668: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_type=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_type=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14387: result: $ac_cv_type_struct_utmp_ut_type" >&5
++echo "configure:16677: result: $ac_cv_type_struct_utmp_ut_type" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_type" >&6
+ if test "$ac_cv_type_struct_utmp_ut_type" = yes; then
+ 	
+@@ -15918,14 +16686,14 @@
+ 	
+ fi
+ 
+-echo "configure:14397: checking for ut_user in struct utmp" >&5
++echo "configure:16689: checking for ut_user in struct utmp" >&5
+ echo $ECHO_N "checking for ut_user in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_user+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14403 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16696 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15935,17 +16703,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14414: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16708: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_user=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_user=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14423: result: $ac_cv_type_struct_utmp_ut_user" >&5
++echo "configure:16717: result: $ac_cv_type_struct_utmp_ut_user" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_user" >&6
+ if test "$ac_cv_type_struct_utmp_ut_user" = yes; then
+ 	
+@@ -15957,14 +16726,14 @@
+ 	
+ fi
+ 
+-echo "configure:14433: checking for ut_exit in struct utmpx" >&5
++echo "configure:16729: checking for ut_exit in struct utmpx" >&5
+ echo $ECHO_N "checking for ut_exit in struct utmpx... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmpx_ut_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14439 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16736 "configure"
+ #include "confdefs.h"
+ #include <utmpx.h>
+ int
+@@ -15974,17 +16743,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14450: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16748: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmpx_ut_exit=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmpx_ut_exit=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14459: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
++echo "configure:16757: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_exit" >&6
+ if test "$ac_cv_type_struct_utmpx_ut_exit" = yes; then
+ 	
+@@ -15996,14 +16766,14 @@
+ 	
+ fi
+ 
+-echo "configure:14469: checking for ut_syslen in struct utmpx" >&5
++echo "configure:16769: checking for ut_syslen in struct utmpx" >&5
+ echo $ECHO_N "checking for ut_syslen in struct utmpx... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmpx_ut_syslen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14475 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16776 "configure"
+ #include "confdefs.h"
+ #include <utmpx.h>
+ int
+@@ -16013,17 +16783,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14486: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16788: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmpx_ut_syslen=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmpx_ut_syslen=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14495: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
++echo "configure:16797: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_syslen" >&6
+ if test "$ac_cv_type_struct_utmpx_ut_syslen" = yes; then
+ 	
+@@ -16035,14 +16806,14 @@
+ 	
+ fi
+ 
+-echo "configure:14505: checking for tm_gmtoff in struct tm" >&5
++echo "configure:16809: checking for tm_gmtoff in struct tm" >&5
+ echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14511 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16816 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -16052,17 +16823,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14522: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16828: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_gmtoff=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_gmtoff=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14531: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
++echo "configure:16837: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
+ if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
+ 	
+@@ -16074,14 +16846,14 @@
+ 	
+ fi
+ 
+-echo "configure:14541: checking for tm_zone in struct tm" >&5
++echo "configure:16849: checking for tm_zone in struct tm" >&5
+ echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14547 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16856 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -16091,17 +16863,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14558: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16868: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_zone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_zone=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14567: result: $ac_cv_type_struct_tm_tm_zone" >&5
++echo "configure:16877: result: $ac_cv_type_struct_tm_tm_zone" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
+ if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
+ 	
+@@ -16113,14 +16886,14 @@
+ 	
+ fi
+ 
+-echo "configure:14577: checking for timezone" >&5
++echo "configure:16889: checking for timezone" >&5
+ echo $ECHO_N "checking for timezone... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14583 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16896 "configure"
+ #include "confdefs.h"
+ extern int timezone;
+ int foo() { return timezone; }
+@@ -16131,20 +16904,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14595: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16909: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_timezone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_timezone=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_timezone`
+-echo "configure:14605: result: $ac_foo" >&5
++echo "configure:16921: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -16153,14 +16927,14 @@
+ EOF
+ 
+ 	
+-echo "configure:14613: checking if timezone is properly declared" >&5
++echo "configure:16930: checking if timezone is properly declared" >&5
+ echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14619 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16937 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ extern struct { int foo; } timezone;
+@@ -16171,19 +16945,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14631: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16950: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_timezone_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_timezone_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:14640: result: $ac_cv_var_timezone_declaration" >&5
++echo "configure:16961: result: $ac_cv_var_timezone_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
+ if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
+ 	
+@@ -16196,13 +16971,13 @@
+ fi
+ 
+ cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
+-echo "configure:14650: checking for sa_family_t" >&5
++echo "configure:16974: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14656 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16980 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16217,29 +16992,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14672: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16997: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14682: result: $ac_foo" >&5
++echo "configure:17007: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:14687: checking for sa_family_t" >&5
++	echo "configure:17012: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sa_family_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14693 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17018 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16252,17 +17028,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14707: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17033: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_sa_family_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_sa_family_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14716: result: $ac_cv_type_sa_family_t" >&5
++echo "configure:17042: result: $ac_cv_type_sa_family_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
+ if test $ac_cv_type_sa_family_t = yes; then
+ 
+@@ -16281,13 +17058,13 @@
+ fi
+ 
+ cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
+-echo "configure:14729: checking for socklen_t" >&5
++echo "configure:17061: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14735 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17067 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16302,29 +17079,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14751: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17084: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14761: result: $ac_foo" >&5
++echo "configure:17094: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:14766: checking for socklen_t" >&5
++	echo "configure:17099: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if test "${ac_cv_type_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14772 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17105 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16337,17 +17115,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14786: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17120: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_socklen_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_socklen_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14795: result: $ac_cv_type_socklen_t" >&5
++echo "configure:17129: result: $ac_cv_type_socklen_t" >&5
+ echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+ if test $ac_cv_type_socklen_t = yes; then
+ 
+@@ -16366,13 +17145,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+-echo "configure:14808: checking for struct sockaddr" >&5
++echo "configure:17148: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14814 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17154 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16387,29 +17166,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14830: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17171: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14840: result: $ac_foo" >&5
++echo "configure:17181: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:14845: checking for struct sockaddr" >&5
++	echo "configure:17186: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14851 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17192 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16422,17 +17202,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14865: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17207: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14874: result: $ac_cv_type_struct_sockaddr" >&5
++echo "configure:17216: result: $ac_cv_type_struct_sockaddr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
+ if test $ac_cv_type_struct_sockaddr = yes; then
+ 
+@@ -16451,13 +17232,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-echo "configure:14887: checking for struct sockaddr_storage" >&5
++echo "configure:17235: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14893 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17241 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16472,29 +17253,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14909: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17258: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14919: result: $ac_foo" >&5
++echo "configure:17268: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:14924: checking for struct sockaddr_storage" >&5
++	echo "configure:17273: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14930 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17279 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16507,17 +17289,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14944: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17294: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_storage=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_storage=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14953: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "configure:17303: result: $ac_cv_type_struct_sockaddr_storage" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
+ if test $ac_cv_type_struct_sockaddr_storage = yes; then
+ 
+@@ -16536,13 +17319,13 @@
+ fi
+ 
+ cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-echo "configure:14966: checking for struct addrinfo" >&5
++echo "configure:17322: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14972 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17328 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16557,29 +17340,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14988: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17345: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14998: result: $ac_foo" >&5
++echo "configure:17355: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:15003: checking for struct addrinfo" >&5
++	echo "configure:17360: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_addrinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15009 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17366 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16592,17 +17376,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15023: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17381: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_addrinfo=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_addrinfo=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:15032: result: $ac_cv_type_struct_addrinfo" >&5
++echo "configure:17390: result: $ac_cv_type_struct_addrinfo" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
+ if test $ac_cv_type_struct_addrinfo = yes; then
+ 
+@@ -16620,7 +17405,7 @@
+ 
+ fi
+ 
+-echo "configure:15044: checking for struct winsize" >&5
++echo "configure:17408: checking for struct winsize" >&5
+ echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
+ if test "${ac_cv_struct_winsize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16628,12 +17413,12 @@
+ 
+ ac_cv_struct_winsize=no
+ for i in sys/termios.h sys/ioctl.h; do
+-cat >conftest.$ac_ext <<EOF
+-#line 15052 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17417 "configure"
+ #include "confdefs.h"
+ #include <$i>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "struct[ 	]*winsize" >/dev/null 2>&1; then
+   ac_cv_struct_winsize=yes; break
+@@ -16650,14 +17435,14 @@
+ EOF
+ 
+ fi
+-echo "configure:15068: result: $ac_cv_struct_winsize" >&5
++echo "configure:17438: result: $ac_cv_struct_winsize" >&5
+ echo "${ECHO_T}$ac_cv_struct_winsize" >&6
+-cat >conftest.$ac_ext <<EOF
+-#line 15071 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17441 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_xpixel" >/dev/null 2>&1; then
+ 
+@@ -16668,12 +17453,12 @@
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 15083 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17457 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_ypixel" >/dev/null 2>&1; then
+ 
+@@ -16684,14 +17469,14 @@
+ fi
+ rm -f conftest*
+ 
+-echo "configure:15094: checking for struct spwd" >&5
++echo "configure:17472: checking for struct spwd" >&5
+ echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
+ if test "${ac_cv_struct_spwd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 15100 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17479 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ #ifdef HAVE_SHADOW_H
+@@ -16704,19 +17489,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15114: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17494: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_spwd=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_struct_spwd=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:15123: result: $ac_cv_struct_spwd" >&5
++echo "configure:17505: result: $ac_cv_struct_spwd" >&5
+ echo "${ECHO_T}$ac_cv_struct_spwd" >&6
+ 
+ if test "$ac_cv_struct_spwd" = "yes"; then
+@@ -16727,14 +17513,14 @@
+ 
+ fi
+ 
+-echo "configure:15130: checking for sa_len in struct sockaddr" >&5
++echo "configure:17516: checking for sa_len in struct sockaddr" >&5
+ echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 15136 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17523 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -16745,17 +17531,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15148: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17536: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_sa_len=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_sa_len=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:15157: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
++echo "configure:17545: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
+ if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
+ 	
+@@ -16770,14 +17557,14 @@
+ for i in int8_t int16_t int32_t int64_t \
+ 	u_int8_t u_int16_t u_int32_t u_int64_t \
+ 	uint8_t uint16_t uint32_t uint64_t; do
+-	echo "configure:15170: checking for $i" >&5
++	echo "configure:17560: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ 	
+ if eval "test \"\${ac_cv_type_$i+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15177 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17567 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_INTTYPES_H
+@@ -16804,15 +17591,16 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15202: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17596: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval ac_cv_type_$i=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval ac_cv_type_$i=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 	eval ac_res=\$ac_cv_type_$i
+@@ -16823,11 +17611,11 @@
+ EOF
+ 
+ 	fi
+-	echo "configure:15218: result: $ac_res" >&5
++	echo "configure:17614: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6
+ done
+ 
+-echo "configure:15221: checking for MD4Init" >&5
++echo "configure:17618: checking for MD4Init" >&5
+ echo $ECHO_N "checking for MD4Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD4Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16842,8 +17630,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15236 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 17634 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16853,14 +17641,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15246: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17646: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD4Init=$ac_lib; else ac_cv_funclib_MD4Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD4Init=\${ac_cv_funclib_MD4Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -16875,13 +17664,13 @@
+ for ac_func in MD4Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15264: checking for $ac_func" >&5
++echo "configure:17667: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15270 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17673 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -16910,17 +17699,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15298: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17704: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15307: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:17713: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -16944,13 +17734,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15327: result: yes" >&5
++	echo "configure:17737: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD4Init=no"
+ 	eval "LIB_MD4Init="
+-	echo "configure:15333: result: no" >&5
++	echo "configure:17743: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -16964,12 +17754,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15345: result: yes, in $ac_res" >&5
++	echo "configure:17757: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15349: checking for MD4_Init" >&5
++echo "configure:17762: checking for MD4_Init" >&5
+ echo $ECHO_N "checking for MD4_Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD4_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16984,8 +17774,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15364 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 17778 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16995,14 +17785,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15374: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17790: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD4_Init=$ac_lib; else ac_cv_funclib_MD4_Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD4_Init=\${ac_cv_funclib_MD4_Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17017,13 +17808,13 @@
+ for ac_func in MD4_Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15392: checking for $ac_func" >&5
++echo "configure:17811: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15398 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17817 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17052,17 +17843,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15426: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17848: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15435: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:17857: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17086,13 +17878,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15455: result: yes" >&5
++	echo "configure:17881: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD4_Init=no"
+ 	eval "LIB_MD4_Init="
+-	echo "configure:15461: result: no" >&5
++	echo "configure:17887: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17106,12 +17898,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15473: result: yes, in $ac_res" >&5
++	echo "configure:17901: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15477: checking for MD5Init" >&5
++echo "configure:17906: checking for MD5Init" >&5
+ echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD5Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17126,8 +17918,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15492 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 17922 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17137,14 +17929,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15502: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17934: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD5Init=$ac_lib; else ac_cv_funclib_MD5Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD5Init=\${ac_cv_funclib_MD5Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17159,13 +17952,13 @@
+ for ac_func in MD5Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15520: checking for $ac_func" >&5
++echo "configure:17955: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15526 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17961 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17194,17 +17987,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15554: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17992: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15563: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18001: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17228,13 +18022,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15583: result: yes" >&5
++	echo "configure:18025: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD5Init=no"
+ 	eval "LIB_MD5Init="
+-	echo "configure:15589: result: no" >&5
++	echo "configure:18031: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17248,12 +18042,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15601: result: yes, in $ac_res" >&5
++	echo "configure:18045: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15605: checking for MD5_Init" >&5
++echo "configure:18050: checking for MD5_Init" >&5
+ echo $ECHO_N "checking for MD5_Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD5_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17268,8 +18062,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15620 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18066 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17279,14 +18073,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15630: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18078: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD5_Init=$ac_lib; else ac_cv_funclib_MD5_Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD5_Init=\${ac_cv_funclib_MD5_Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17301,13 +18096,13 @@
+ for ac_func in MD5_Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15648: checking for $ac_func" >&5
++echo "configure:18099: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15654 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18105 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17336,17 +18131,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15682: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18136: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15691: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18145: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17370,13 +18166,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15711: result: yes" >&5
++	echo "configure:18169: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD5_Init=no"
+ 	eval "LIB_MD5_Init="
+-	echo "configure:15717: result: no" >&5
++	echo "configure:18175: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17390,12 +18186,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15729: result: yes, in $ac_res" >&5
++	echo "configure:18189: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15733: checking for SHA1Init" >&5
++echo "configure:18194: checking for SHA1Init" >&5
+ echo $ECHO_N "checking for SHA1Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_SHA1Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17410,8 +18206,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15748 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18210 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17421,14 +18217,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15758: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18222: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_SHA1Init=$ac_lib; else ac_cv_funclib_SHA1Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_SHA1Init=\${ac_cv_funclib_SHA1Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17443,13 +18240,13 @@
+ for ac_func in SHA1Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15776: checking for $ac_func" >&5
++echo "configure:18243: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15782 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18249 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17478,17 +18275,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15810: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18280: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15819: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18289: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17512,13 +18310,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15839: result: yes" >&5
++	echo "configure:18313: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_SHA1Init=no"
+ 	eval "LIB_SHA1Init="
+-	echo "configure:15845: result: no" >&5
++	echo "configure:18319: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17532,12 +18330,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15857: result: yes, in $ac_res" >&5
++	echo "configure:18333: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15861: checking for SHA1_Init" >&5
++echo "configure:18338: checking for SHA1_Init" >&5
+ echo $ECHO_N "checking for SHA1_Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_SHA1_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17552,8 +18350,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15876 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18354 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17563,14 +18361,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15886: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18366: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_SHA1_Init=$ac_lib; else ac_cv_funclib_SHA1_Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_SHA1_Init=\${ac_cv_funclib_SHA1_Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17585,13 +18384,13 @@
+ for ac_func in SHA1_Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15904: checking for $ac_func" >&5
++echo "configure:18387: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15910 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18393 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17620,17 +18419,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15938: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18424: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15947: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18433: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17654,13 +18454,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15967: result: yes" >&5
++	echo "configure:18457: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_SHA1_Init=no"
+ 	eval "LIB_SHA1_Init="
+-	echo "configure:15973: result: no" >&5
++	echo "configure:18463: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17674,12 +18474,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15985: result: yes, in $ac_res" >&5
++	echo "configure:18477: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15989: checking for des_cbc_encrypt" >&5
++echo "configure:18482: checking for des_cbc_encrypt" >&5
+ echo $ECHO_N "checking for des_cbc_encrypt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_des_cbc_encrypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17694,8 +18494,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 16004 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18498 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17705,14 +18505,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16014: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18510: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_des_cbc_encrypt=$ac_lib; else ac_cv_funclib_des_cbc_encrypt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_des_cbc_encrypt=\${ac_cv_funclib_des_cbc_encrypt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17727,13 +18528,13 @@
+ for ac_func in des_cbc_encrypt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:16032: checking for $ac_func" >&5
++echo "configure:18531: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16038 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18537 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17762,17 +18563,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16066: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18568: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16075: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18577: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17796,13 +18598,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16095: result: yes" >&5
++	echo "configure:18601: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_des_cbc_encrypt=no"
+ 	eval "LIB_des_cbc_encrypt="
+-	echo "configure:16101: result: no" >&5
++	echo "configure:18607: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17816,12 +18618,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16113: result: yes, in $ac_res" >&5
++	echo "configure:18621: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:16117: checking for el_init" >&5
++echo "configure:18626: checking for el_init" >&5
+ echo $ECHO_N "checking for el_init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_el_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17836,8 +18638,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib $LIB_tgetent $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 16132 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18642 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17847,14 +18649,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16142: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18654: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_el_init=$ac_lib; else ac_cv_funclib_el_init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_el_init=\${ac_cv_funclib_el_init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17869,13 +18672,13 @@
+ for ac_func in el_init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:16160: checking for $ac_func" >&5
++echo "configure:18675: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16166 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18681 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17904,17 +18707,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16194: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18712: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16203: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18721: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17938,13 +18742,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16223: result: yes" >&5
++	echo "configure:18745: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_el_init=no"
+ 	eval "LIB_el_init="
+-	echo "configure:16229: result: no" >&5
++	echo "configure:18751: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17958,20 +18762,20 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16241: result: yes, in $ac_res" >&5
++	echo "configure:18765: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ if test "$ac_cv_func_el_init" = yes ; then
+-	echo "configure:16246: checking for four argument el_init" >&5
++	echo "configure:18771: checking for four argument el_init" >&5
+ echo $ECHO_N "checking for four argument el_init... $ECHO_C" >&6
+ if test "${ac_cv_func_el_init_four+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-		cat >conftest.$ac_ext <<EOF
+-#line 16252 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18778 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 			#include <histedit.h>
+@@ -17982,17 +18786,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16264: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:18791: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_el_init_four=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_el_init_four=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:16273: result: $ac_cv_func_el_init_four" >&5
++echo "configure:18800: result: $ac_cv_func_el_init_four" >&5
+ echo "${ECHO_T}$ac_cv_func_el_init_four" >&6
+ 	if test "$ac_cv_func_el_init_four" = yes; then
+ 		
+@@ -18010,9 +18815,11 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++ 	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $LIB_el_init"
+ else
+-	LIB_readline='$(top_builddir)/lib/editline/libeditline.a'
++ 	DIR_readline="editline"
++	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ 
+ if test "$ac_foo" = yes; then
+@@ -18022,15 +18829,66 @@
+   el_compat_TRUE='#'
+   el_compat_FALSE=
+ fi
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_READLINE 1
+ EOF
+ 
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++
++cat >>confdefs.h <<\EOF
++#define HAVE_COM_ERR 1
++EOF
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++cat >>confdefs.h <<\EOF
++#define HAVE_SS 1
++EOF
++
+ cat >>confdefs.h <<\EOF
+ #define AUTHENTICATION 1
+ EOF
+@@ -18063,13 +18921,13 @@
+ #
+ # And also something wierd has happend with dec-osf1, fallback to bsd-ptys
+ 
+-echo "configure:16331: checking for getmsg" >&5
++echo "configure:18924: checking for getmsg" >&5
+ echo $ECHO_N "checking for getmsg... $ECHO_C" >&6
+ if test "${ac_cv_func_getmsg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16337 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18930 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getmsg (); below.  */
+@@ -18098,20 +18956,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16365: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18961: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_getmsg=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getmsg=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16374: result: $ac_cv_func_getmsg" >&5
++echo "configure:18970: result: $ac_cv_func_getmsg" >&5
+ echo "${ECHO_T}$ac_cv_func_getmsg" >&6
+ 
+-echo "configure:16376: checking for working getmsg" >&5
++echo "configure:18973: checking for working getmsg" >&5
+ echo $ECHO_N "checking for working getmsg... $ECHO_C" >&6
+ if test "${ac_cv_func_getmsg_work+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18119,8 +18978,8 @@
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_getmsg_work=no
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16385 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18982 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -18135,20 +18994,21 @@
+   return 0;
+ }
+ 
+-EOF
+-if { (eval echo configure:16398: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:18999: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   ac_cv_func_getmsg_work=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getmsg_work=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:16409: result: $ac_cv_func_getmsg_work" >&5
++echo "configure:19011: result: $ac_cv_func_getmsg_work" >&5
+ echo "${ECHO_T}$ac_cv_func_getmsg_work" >&6
+ test "$ac_cv_func_getmsg_work" = "yes" &&
+ 
+@@ -18157,7 +19017,7 @@
+ EOF
+ 
+ if test "$ac_cv_func_getmsg_work" = yes; then
+-echo "configure:16416: checking for streamspty" >&5
++echo "configure:19020: checking for streamspty" >&5
+ echo $ECHO_N "checking for streamspty... $ECHO_C" >&6
+ case "$host" in
+ *-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[01]*)
+@@ -18167,7 +19027,7 @@
+ 	krb_cv_sys_streamspty=yes
+ 	;;
+ esac
+-echo "configure:16426: result: $krb_cv_sys_streamspty" >&5
++echo "configure:19030: result: $krb_cv_sys_streamspty" >&5
+ echo "${ECHO_T}$krb_cv_sys_streamspty" >&6
+ fi
+ if test "$krb_cv_sys_streamspty" = yes; then
+@@ -18178,7 +19038,7 @@
+ 
+ fi
+ 
+-echo "configure:16435: checking which authentication modules should be built" >&5
++echo "configure:19041: checking which authentication modules should be built" >&5
+ echo $ECHO_N "checking which authentication modules should be built... $ECHO_C" >&6
+ 
+ LIB_AUTH_SUBDIRS=
+@@ -18195,7 +19055,7 @@
+ *-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
+ esac
+ 
+-echo "configure:16447: result: $LIB_AUTH_SUBDIRS" >&5
++echo "configure:19058: result: $LIB_AUTH_SUBDIRS" >&5
+ echo "${ECHO_T}$LIB_AUTH_SUBDIRS" >&6
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -18277,18 +19137,17 @@
+ cat >confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+-# scripts and configure runs.  It is not useful on other systems.
+-# If it contains results you don't want to keep, you may remove or edit it.
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
+ #
+-# By default, configure uses `config.cache' as the cache file,
+-# creating it if it does not exist already.  You can give configure
+-# the --cache-file=FILE option to use a different cache file; that is
+-# what configure does when it calls configure scripts in
+-# subdirectories, so they share the cache.
+-# Giving --cache-file=/dev/null disables caching, for debugging configure.
+-# config.status only pays attention to the cache file if you give it the
+-# --recheck option to rerun configure.
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
+ #
++# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
+ EOF
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+@@ -18311,7 +19170,7 @@
+       ;;
+     esac;
+ } |
+-  sed 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
++  sed '/^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
+ if cmp -s $cache_file confcache; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+@@ -18374,6 +19233,40 @@
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in ./config.log if it exists.
+ 
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++
++# Support unset when possible.
++if (unset FOO) >/dev/null 2>&1; then
++  ac_unset=unset
++else
++  ac_unset=false
++fi
++
++# NLS nuisances.
++$ac_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
++$ac_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
++$ac_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
++$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
++$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
++$ac_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
++$ac_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
++$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++ac_nl='
++'
++IFS=" 	$ac_nl"
++
++# CDPATH.
++$ac_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
++
+ debug=false
+ me=`echo "$0" | sed 's,.*/,,'`
+ SHELL=${CONFIG_SHELL-/bin/sh}
+@@ -18403,7 +19296,7 @@
+ \`$me' instantiates files from templates according to the
+ current configuration.
+ 
+-Usage: $0 [OPTIONS] FILE...
++Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
+@@ -18428,7 +19321,7 @@
+ 
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+-$CONFIG_STATUS generated by autoconf version 2.14a.
++$CONFIG_STATUS generated by autoconf version 2.49b.
+ Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by
+   `echo "$0 $ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`"
+ 
+@@ -18572,7 +19465,8 @@
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=$TMPDIR/cs$$-$RANDOM && (umask 077 && mkdir $tmp)
++  tmp=$TMPDIR/cs$$-$RANDOM
++  (umask 077 && mkdir $tmp)
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+@@ -18586,6 +19480,15 @@
+ # INIT-COMMANDS section.
+ #
+ 
++am_indx=1
++  for am_file in include/config.h; do
++    case " $CONFIG_HEADERS " in
++    *" $am_file "*)
++      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
++      ;;
++    esac
++    am_indx=\`expr \$am_indx + 1\`
++  done
+ AMDEP="$AMDEP"
+ ac_aux_dir="$ac_aux_dir"
+ 
+@@ -18603,6 +19506,8 @@
+   # Protect against being on the right side of a sed subst in config.status.
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@COMPILE_ET@,$COMPILE_ET,;t t
++s,@LIB_sl@,$LIB_sl,;t t
+ s,@SHELL@,$SHELL,;t t
+ s,@exec_prefix@,$exec_prefix,;t t
+ s,@prefix@,$prefix,;t t
+@@ -18631,8 +19536,8 @@
+ s,@LIBS@,$LIBS,;t t
+ s,@CC@,$CC,;t t
+ s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+ s,@OBJEXT@,$OBJEXT,;t t
++s,@EXEEXT@,$EXEEXT,;t t
+ s,@CPP@,$CPP,;t t
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+@@ -18666,10 +19571,8 @@
+ s,@LEXLIB@,$LEXLIB,;t t
+ s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+ s,@RANLIB@,$RANLIB,;t t
+-s,@LN_S@,$LN_S,;t t
+ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@STRIP@,$STRIP,;t t
+-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@LN_S@,$LN_S,;t t
+ s,@LIBTOOL@,$LIBTOOL,;t t
+ s,@WFLAGS@,$WFLAGS,;t t
+ s,@WFLAGS_NOUNUSED@,$WFLAGS_NOUNUSED,;t t
+@@ -18700,8 +19603,10 @@
+ s,@DIR_roken@,$DIR_roken,;t t
+ s,@LIB_roken@,$LIB_roken,;t t
+ s,@CPPFLAGS_roken@,$CPPFLAGS_roken,;t t
++s,@DIR_openldap@,$DIR_openldap,;t t
+ s,@INCLUDE_openldap@,$INCLUDE_openldap,;t t
+ s,@LIB_openldap@,$LIB_openldap,;t t
++s,@DIR_krb4@,$DIR_krb4,;t t
+ s,@INCLUDE_krb4@,$INCLUDE_krb4,;t t
+ s,@LIB_krb4@,$LIB_krb4,;t t
+ s,@EXTRA_LIB45@,$EXTRA_LIB45,;t t
+@@ -18727,8 +19632,16 @@
+ s,@CATMAN_TRUE@,$CATMAN_TRUE,;t t
+ s,@CATMAN_FALSE@,$CATMAN_FALSE,;t t
+ s,@CATMANEXT@,$CATMANEXT,;t t
++s,@DIR_readline@,$DIR_readline,;t t
+ s,@INCLUDE_readline@,$INCLUDE_readline,;t t
+ s,@LIB_readline@,$LIB_readline,;t t
++s,@DIR_com_err@,$DIR_com_err,;t t
++s,@INCLUDE_com_err@,$INCLUDE_com_err,;t t
++s,@LIB_com_err@,$LIB_com_err,;t t
++s,@DIR_ss@,$DIR_ss,;t t
++s,@INCLUDE_ss@,$INCLUDE_ss,;t t
++s,@LIB_ss@,$LIB_ss,;t t
++s,@DIR_hesiod@,$DIR_hesiod,;t t
+ s,@INCLUDE_hesiod@,$INCLUDE_hesiod,;t t
+ s,@LIB_hesiod@,$LIB_hesiod,;t t
+ s,@AIX_TRUE@,$AIX_TRUE,;t t
+@@ -18829,7 +19742,13 @@
+       X"$ac_file" : 'X\(//\)[^/]' \| \
+       X"$ac_file" : 'X\(//\)$' \| \
+       X"$ac_file" : 'X\(/\)' \| \
+-      .   : '\(.\)'`
++      .   : '\(.\)' 2>/dev/null ||
++echo "X"$ac_file"" | sed '
++	    /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
++	    /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
++	    /^X\(\/\/\)$/{ s//\1/p; q; }
++	    /^X\(\/\).*/{ s//\1/p; q; }
++	    s/.*/./p; q'`
+   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+     { case "$ac_dir" in
+   [\\/]* | ?:[\\/]* ) ac_incr_dir=;;
+@@ -18897,7 +19816,7 @@
+            { echo "configure: error: cannot find input file \\\`$f'" >&2; exit 1; }
+          fi;;
+       esac
+-    done`
++    done` || { (exit 1); exit; }
+ EOF
+ cat >>$CONFIG_STATUS <<EOF
+   sed "$ac_vpsub
+@@ -18977,7 +19896,7 @@
+            { echo "configure: error: cannot find input file \\\`$f'" >&2; exit 1; }
+          fi;;
+       esac
+-    done`
++    done` || { (exit 1); exit; }
+   # Remove the trailing spaces.
+   sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
+ 
+@@ -19093,7 +20012,13 @@
+       X"$ac_file" : 'X\(//\)[^/]' \| \
+       X"$ac_file" : 'X\(//\)$' \| \
+       X"$ac_file" : 'X\(/\)' \| \
+-      .   : '\(.\)'`
++      .   : '\(.\)' 2>/dev/null ||
++echo "X"$ac_file"" | sed '
++	    /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
++	    /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
++	    /^X\(\/\/\)$/{ s//\1/p; q; }
++	    /^X\(\/\).*/{ s//\1/p; q; }
++	    s/.*/./p; q'`
+       if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+         { case "$ac_dir" in
+   [\\/]* | ?:[\\/]* ) ac_incr_dir=;;
+@@ -19125,7 +20050,7 @@
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ 
+   case $ac_dest in
+-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h ;;
++    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp >	   include/stamp-h ;;
+     default-2 )
+ test x"$AMDEP" != x"" ||
+ for mf in $CONFIG_FILES; do
+diff -ruN heimdal-0.3c-old/doc/Makefile.in heimdal-0.3c/doc/Makefile.in
+--- heimdal-0.3c-old/doc/Makefile.in	Wed Sep 20 20:55:57 2000
++++ heimdal-0.3c/doc/Makefile.in	Tue Nov 28 09:56:36 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/include/Makefile.in heimdal-0.3c/include/Makefile.in
+--- heimdal-0.3c-old/include/Makefile.in	Wed Sep 20 20:55:32 2000
++++ heimdal-0.3c/include/Makefile.in	Tue Nov 28 09:56:22 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -405,10 +415,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3c-old/include/config.h.in heimdal-0.3c/include/config.h.in
+--- heimdal-0.3c-old/include/config.h.in	Wed Sep 20 20:58:25 2000
++++ heimdal-0.3c/include/config.h.in	Tue Nov 28 09:56:20 2000
+@@ -30,6 +30,9 @@
+ /* Define if realloc(NULL) doesn't work. */
+ #undef BROKEN_REALLOC
+ 
++/* Define if you have the com_err package. */
++#undef COM_ERR
++
+ /* Define if you want support for DCE/DFS PAG's. */
+ #undef DCE
+ 
+@@ -100,6 +103,9 @@
+ /* Define if you have the `chown' function. */
+ #undef HAVE_CHOWN
+ 
++/* Define if you have a com_err compatible library. */
++#undef HAVE_COM_ERR
++
+ /* Define if you have the <config.h> header file. */
+ #undef HAVE_CONFIG_H
+ 
+@@ -344,36 +350,6 @@
+ /* 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 `bsd' library (-lbsd). */
+-#undef HAVE_LIBBSD
+-
+-/* Define if you have the `dnet' library (-ldnet). */
+-#undef HAVE_LIBDNET
+-
+-/* Define if you have the `dnet_stub' library (-ldnet_stub). */
+-#undef HAVE_LIBDNET_STUB
+-
+-/* Define if you have the `fl' library (-lfl). */
+-#undef HAVE_LIBFL
+-
+-/* Define if you have the `ICE' library (-lICE). */
+-#undef HAVE_LIBICE
+-
+-/* Define if you have the `ipc' library (-lipc). */
+-#undef HAVE_LIBIPC
+-
+-/* Define if you have the `l' library (-ll). */
+-#undef HAVE_LIBL
+-
+-/* Define if you have the `nsl' library (-lnsl). */
+-#undef HAVE_LIBNSL
+-
+-/* Define if you have the `posix' library (-lposix). */
+-#undef HAVE_LIBPOSIX
+-
+-/* Define if you have the `socket' library (-lsocket). */
+-#undef HAVE_LIBSOCKET
+-
+ /* Define if you have the <limits.h> header file. */
+ #undef HAVE_LIMITS_H
+ 
+@@ -614,6 +590,9 @@
+ /* Define if the system has the type `socklen_t'. */
+ #undef HAVE_SOCKLEN_T
+ 
++/* Define if you have a ss compatible library. */
++#undef HAVE_SS
++
+ /* Define if you have the <standards.h> header file. */
+ #undef HAVE_STANDARDS_H
+ 
+@@ -1073,6 +1052,9 @@
+ 
+ /* Define as the return type of signal handlers (`int' or `void'). */
+ #undef RETSIGTYPE
++
++/* Define if you have the ss package. */
++#undef SS
+ 
+ /* Define if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+diff -ruN heimdal-0.3c-old/include/kadm5/Makefile.in heimdal-0.3c/include/kadm5/Makefile.in
+--- heimdal-0.3c-old/include/kadm5/Makefile.in	Wed Sep 20 20:55:32 2000
++++ heimdal-0.3c/include/kadm5/Makefile.in	Tue Nov 28 09:56:23 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/kadmin/Makefile.in heimdal-0.3c/kadmin/Makefile.in
+--- heimdal-0.3c-old/kadmin/Makefile.in	Wed Sep 20 20:55:45 2000
++++ heimdal-0.3c/kadmin/Makefile.in	Tue Nov 28 09:56:30 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -123,13 +126,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline) $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
++INCLUDES = -I$(top_builddir)/include $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_ss) -I$(srcdir)/../lib/krb5
+ 
+ AM_CFLAGS =  $(WFLAGS) $(CPPFLAGS_roken)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -250,7 +260,7 @@
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(COMMON_LDADD) \
+ 	$(LIB_dlopen)
+@@ -295,9 +305,8 @@
+ kadmin_OBJECTS =  $(am_kadmin_OBJECTS)
+ kadmin_DEPENDENCIES =  $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
+-$(top_builddir)/lib/sl/libsl.la $(top_builddir)/lib/hdb/libhdb.la \
+-$(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/des/libdes.la \
+-$(top_builddir)/lib/asn1/libasn1.la
++$(top_builddir)/lib/hdb/libhdb.la $(top_builddir)/lib/krb5/libkrb5.la \
++$(top_builddir)/lib/des/libdes.la $(top_builddir)/lib/asn1/libasn1.la
+ kadmin_LDFLAGS = 
+ @KRB4_FALSE@am_kadmind_OBJECTS =  kadmind.$(OBJEXT) server.$(OBJEXT) \
+ @KRB4_FALSE@kadm_conn.$(OBJEXT)
+diff -ruN heimdal-0.3c-old/kdc/Makefile.in heimdal-0.3c/kdc/Makefile.in
+--- heimdal-0.3c-old/kdc/Makefile.in	Wed Sep 20 20:55:46 2000
++++ heimdal-0.3c/kdc/Makefile.in	Tue Nov 28 09:56:30 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/kpasswd/Makefile.in heimdal-0.3c/kpasswd/Makefile.in
+--- heimdal-0.3c-old/kpasswd/Makefile.in	Wed Sep 20 20:55:44 2000
++++ heimdal-0.3c/kpasswd/Makefile.in	Tue Nov 28 09:56:29 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/kuser/Makefile.in heimdal-0.3c/kuser/Makefile.in
+--- heimdal-0.3c-old/kuser/Makefile.in	Wed Sep 20 20:55:44 2000
++++ heimdal-0.3c/kuser/Makefile.in	Tue Nov 28 09:56:29 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/45/Makefile.in heimdal-0.3c/lib/45/Makefile.in
+--- heimdal-0.3c-old/lib/45/Makefile.in	Wed Sep 20 20:55:33 2000
++++ heimdal-0.3c/lib/45/Makefile.in	Tue Nov 28 09:56:23 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/Makefile.in heimdal-0.3c/lib/Makefile.in
+--- heimdal-0.3c-old/lib/Makefile.in	Wed Sep 20 20:55:33 2000
++++ heimdal-0.3c/lib/Makefile.in	Tue Nov 28 09:56:23 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -194,7 +204,7 @@
+ @OTP_TRUE@dir_otp = @OTP_TRUE@otp
+ @DCE_TRUE@dir_dce = @DCE_TRUE@kdfs
+ 
+-SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 des krb5 \
++SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ asn1 des krb5 \
+ 	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+ 
+ subdir = lib
+@@ -214,8 +224,8 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ 
+ GZIP_ENV = --best
+-DIST_SUBDIRS =  @DIR_roken@ vers editline com_err sl asn1 des krb5 kafs \
+-hdb kadm5 gssapi auth 45 otp kdfs
++DIST_SUBDIRS =  @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ \
++asn1 des krb5 kafs hdb kadm5 gssapi auth 45 otp kdfs
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .et .h .x
+@@ -260,10 +270,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3c-old/lib/asn1/Makefile.in heimdal-0.3c/lib/asn1/Makefile.in
+--- heimdal-0.3c-old/lib/asn1/Makefile.in	Wed Sep 20 20:55:35 2000
++++ heimdal-0.3c/lib/asn1/Makefile.in	Tue Nov 28 09:56:24 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -123,13 +126,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include
++INCLUDES = -I$(top_builddir)/include $(INCLUDE_com_err)
+ 
+ AM_CFLAGS =  $(WFLAGS) $(CPPFLAGS_roken)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -274,12 +284,12 @@
+ 
+ 
+ asn1_compile_LDADD = \
+-	$(LIB_roken) $(LEXLIB)
++        $(LIB_roken) $(LEXLIB)
+ 
+ 
+ check_der_LDADD = \
+ 	libasn1.la \
+-	../com_err/libcom_err.la \
++	$(LIB_com_err) \
+ 	$(LIB_roken)
+ 
+ 
+@@ -339,11 +349,11 @@
+ asn1_compile_LDFLAGS = 
+ asn1_print_SOURCES = asn1_print.c
+ asn1_print_OBJECTS =  asn1_print.$(OBJEXT)
+-asn1_print_DEPENDENCIES =  libasn1.la ../com_err/libcom_err.la
++asn1_print_DEPENDENCIES =  libasn1.la
+ asn1_print_LDFLAGS = 
+ check_der_SOURCES = check-der.c
+ check_der_OBJECTS =  check-der.$(OBJEXT)
+-check_der_DEPENDENCIES =  libasn1.la ../com_err/libcom_err.la
++check_der_DEPENDENCIES =  libasn1.la
+ check_der_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3c-old/lib/auth/Makefile.in heimdal-0.3c/lib/auth/Makefile.in
+--- heimdal-0.3c-old/lib/auth/Makefile.in	Wed Sep 20 20:55:34 2000
++++ heimdal-0.3c/lib/auth/Makefile.in	Tue Nov 28 09:56:23 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -253,10 +263,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3c-old/lib/auth/afskauthlib/Makefile.in heimdal-0.3c/lib/auth/afskauthlib/Makefile.in
+--- heimdal-0.3c-old/lib/auth/afskauthlib/Makefile.in	Wed Sep 20 20:55:34 2000
++++ heimdal-0.3c/lib/auth/afskauthlib/Makefile.in	Tue Nov 28 09:56:23 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/auth/pam/Makefile.in heimdal-0.3c/lib/auth/pam/Makefile.in
+--- heimdal-0.3c-old/lib/auth/pam/Makefile.in	Wed Sep 20 20:55:34 2000
++++ heimdal-0.3c/lib/auth/pam/Makefile.in	Tue Nov 28 09:56:24 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/auth/sia/Makefile.in heimdal-0.3c/lib/auth/sia/Makefile.in
+--- heimdal-0.3c-old/lib/auth/sia/Makefile.in	Wed Sep 20 20:55:35 2000
++++ heimdal-0.3c/lib/auth/sia/Makefile.in	Tue Nov 28 09:56:24 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+@@ -128,7 +131,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -202,10 +212,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.a		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
+-	$(top_builddir)/lib/roken/.libs/libroken.a	\
+-	$(LIB_getpwnam_r)				\
+-	-lc
++	@LIB_sl@
+ 
+ 
+ L_shared = \
+@@ -214,10 +221,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.so		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
+-	$(top_builddir)/lib/roken/.libs/libroken.so	\
+-	$(LIB_getpwnam_r)				\
+-	-lc
++	@LIB_sl@
+ 
+ 
+ EXTRA_DIST = sia.c krb5_matrix.conf krb5+c2_matrix.conf security.patch
+@@ -568,6 +572,12 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	fi
++	$(top_builddir)/lib/roken/.libs/libroken.a	\
++	$(LIB_getpwnam_r)				\
++	-lc
++	$(top_builddir)/lib/roken/.libs/libroken.so	\
++	$(LIB_getpwnam_r)				\
++	-lc
+ 
+ libsia_krb5.so: $(OBJS)
+ 	if test -f $(top_builddir)/lib/krb5/.libs/libkrb5.a; then \
+diff -ruN heimdal-0.3c-old/lib/com_err/Makefile.in heimdal-0.3c/lib/com_err/Makefile.in
+--- heimdal-0.3c-old/lib/com_err/Makefile.in	Wed Sep 20 20:55:36 2000
++++ heimdal-0.3c/lib/com_err/Makefile.in	Tue Nov 28 09:56:25 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -438,6 +448,8 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+diff -ruN heimdal-0.3c-old/lib/des/Makefile.in heimdal-0.3c/lib/des/Makefile.in
+--- heimdal-0.3c-old/lib/des/Makefile.in	Wed Sep 20 20:55:36 2000
++++ heimdal-0.3c/lib/des/Makefile.in	Tue Nov 28 09:56:25 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -610,6 +620,8 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+diff -ruN heimdal-0.3c-old/lib/editline/Makefile.in heimdal-0.3c/lib/editline/Makefile.in
+--- heimdal-0.3c-old/lib/editline/Makefile.in	Wed Sep 20 20:55:37 2000
++++ heimdal-0.3c/lib/editline/Makefile.in	Tue Nov 28 09:56:25 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -192,21 +202,22 @@
+ 
+ man_MANS = editline.3
+ 
+-lib_LIBRARIES = libeditline.a
++lib_LTLIBRARIES = libeditline.la
++libeditline_la_LDFLAGS = -static
+ @el_compat_TRUE@noinst_LIBRARIES = @el_compat_TRUE@libel_compat.a
+ @el_compat_FALSE@noinst_LIBRARIES = 
+ 
+ noinst_PROGRAMS = testit
+ 
+ testit_LDADD = \
+-	libeditline.a \
++	libeditline.la \
+ 	$(LIB_tgetent) \
+ 	$(LIB_roken)
+ 
+ 
+ include_HEADERS = editline.h
+ 
+-libeditline_a_SOURCES = complete.c editline.c sysunix.c \
++libeditline_la_SOURCES = complete.c editline.c sysunix.c \
+ 	editline.h roken_rename.h unix.h
+ 
+ libel_compat_a_SOURCES = edit_compat.c
+@@ -216,7 +227,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../include/config.h
+ CONFIG_CLEAN_FILES = 
+-LIBRARIES =  $(lib_LIBRARIES) $(noinst_LIBRARIES)
++LIBRARIES =  $(noinst_LIBRARIES)
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
+@@ -227,29 +238,29 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libeditline_a_AR = $(AR) cru
+-libeditline_a_LIBADD = 
+-am_libeditline_a_OBJECTS =  complete.$(OBJEXT) editline.$(OBJEXT) \
+-sysunix.$(OBJEXT)
+-libeditline_a_OBJECTS =  $(am_libeditline_a_OBJECTS)
+ libel_compat_a_AR = $(AR) cru
+ libel_compat_a_LIBADD = 
+ am_libel_compat_a_OBJECTS =  edit_compat.$(OBJEXT)
+ libel_compat_a_OBJECTS =  $(am_libel_compat_a_OBJECTS)
+ AR = ar
++LTLIBRARIES =  $(lib_LTLIBRARIES)
++
++libeditline_la_LIBADD = 
++am_libeditline_la_OBJECTS =  complete.lo editline.lo sysunix.lo
++libeditline_la_OBJECTS =  $(am_libeditline_la_OBJECTS)
+ noinst_PROGRAMS =  testit$(EXEEXT)
+ PROGRAMS =  $(noinst_PROGRAMS)
+ 
+ testit_SOURCES = testit.c
+ testit_OBJECTS =  testit.$(OBJEXT)
+-testit_DEPENDENCIES =  libeditline.a
++testit_DEPENDENCIES =  libeditline.la
+ testit_LDFLAGS = 
+ 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) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES =  $(libeditline_a_SOURCES) $(libel_compat_a_SOURCES) \
++DIST_SOURCES =  $(libel_compat_a_SOURCES) $(libeditline_la_SOURCES) \
+ testit.c
+ man3dir = $(mandir)/man3
+ MANS = $(man_MANS)
+@@ -263,8 +274,8 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ 
+ GZIP_ENV = --best
+-SOURCES = $(libeditline_a_SOURCES) $(libel_compat_a_SOURCES) testit.c
+-OBJECTS = $(am_libeditline_a_OBJECTS) $(am_libel_compat_a_OBJECTS) testit.$(OBJEXT)
++SOURCES = $(libel_compat_a_SOURCES) $(libeditline_la_SOURCES) testit.c
++OBJECTS = $(am_libel_compat_a_OBJECTS) $(am_libeditline_la_OBJECTS) testit.$(OBJEXT)
+ 
+ all: all-redirect
+ .SUFFIXES:
+@@ -277,39 +288,6 @@
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+ 
+-mostlyclean-libLIBRARIES:
+-
+-clean-libLIBRARIES:
+-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+-
+-distclean-libLIBRARIES:
+-
+-maintainer-clean-libLIBRARIES:
+-
+-install-libLIBRARIES: $(lib_LIBRARIES)
+-	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+-	  else :; fi; \
+-	done
+-	@$(POST_INSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+-	  else :; fi; \
+-	done
+-
+-uninstall-libLIBRARIES:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
+-	  rm -f $(DESTDIR)$(libdir)/$$p; \
+-	done
+-
+ mostlyclean-noinstLIBRARIES:
+ 
+ clean-noinstLIBRARIES:
+@@ -340,16 +318,40 @@
+ 
+ maintainer-clean-libtool:
+ 
+-libeditline.a: $(libeditline_a_OBJECTS) $(libeditline_a_DEPENDENCIES)
+-	-rm -f libeditline.a
+-	$(libeditline_a_AR) libeditline.a $(libeditline_a_OBJECTS) $(libeditline_a_LIBADD)
+-	$(RANLIB) libeditline.a
+-
+ libel_compat.a: $(libel_compat_a_OBJECTS) $(libel_compat_a_DEPENDENCIES)
+ 	-rm -f libel_compat.a
+ 	$(libel_compat_a_AR) libel_compat.a $(libel_compat_a_OBJECTS) $(libel_compat_a_LIBADD)
+ 	$(RANLIB) libel_compat.a
+ 
++mostlyclean-libLTLIBRARIES:
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++
++distclean-libLTLIBRARIES:
++
++maintainer-clean-libLTLIBRARIES:
++
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo " $(LIBTOOL)  --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \
++	  else :; fi; \
++	done
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  echo " $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	done
++
++libeditline.la: $(libeditline_la_OBJECTS) $(libeditline_la_DEPENDENCIES)
++	$(LINK) -rpath $(libdir) $(libeditline_la_LDFLAGS) $(libeditline_la_OBJECTS) $(libeditline_la_LIBADD) $(LIBS)
++
+ mostlyclean-noinstPROGRAMS:
+ 
+ clean-noinstPROGRAMS:
+@@ -485,7 +487,7 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+-install-exec-am: install-libLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-exec: install-exec-am
+@@ -496,10 +498,11 @@
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+-uninstall-am: uninstall-libLIBRARIES uninstall-man \
++uninstall-am: uninstall-libLTLIBRARIES uninstall-man \
+ 		uninstall-includeHEADERS
+ uninstall: uninstall-am
+-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) all-local
++all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(MANS) \
++		$(HEADERS) all-local
+ all-redirect: all-am
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+@@ -518,30 +521,30 @@
+ 
+ maintainer-clean-generic:
+ 	-rm -f Makefile.in
+-mostlyclean-am:  mostlyclean-libLIBRARIES mostlyclean-noinstLIBRARIES \
+-		mostlyclean-compile mostlyclean-libtool \
++mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-libLTLIBRARIES \
+ 		mostlyclean-noinstPROGRAMS mostlyclean-tags \
+ 		mostlyclean-generic
+ 
+ mostlyclean: mostlyclean-am
+ 
+-clean-am:  clean-libLIBRARIES clean-noinstLIBRARIES clean-compile \
+-		clean-libtool clean-noinstPROGRAMS clean-tags \
++clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool \
++		clean-libLTLIBRARIES clean-noinstPROGRAMS clean-tags \
+ 		clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+-distclean-am:  distclean-libLIBRARIES distclean-noinstLIBRARIES \
+-		distclean-compile distclean-libtool \
++distclean-am:  distclean-noinstLIBRARIES distclean-compile \
++		distclean-libtool distclean-libLTLIBRARIES \
+ 		distclean-noinstPROGRAMS distclean-tags \
+ 		distclean-generic clean-am
+ 	-rm -f libtool
+ 
+ distclean: distclean-am
+ 
+-maintainer-clean-am:  maintainer-clean-libLIBRARIES \
+-		maintainer-clean-noinstLIBRARIES \
++maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+ 		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-libLTLIBRARIES \
+ 		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
+ 		maintainer-clean-generic distclean-am
+ 	@echo "This command is intended for maintainers to use;"
+@@ -549,19 +552,20 @@
+ 
+ maintainer-clean: maintainer-clean-am
+ 
+-.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \
+-clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
+-install-libLIBRARIES mostlyclean-noinstLIBRARIES \
+-distclean-noinstLIBRARIES clean-noinstLIBRARIES \
+-maintainer-clean-noinstLIBRARIES mostlyclean-compile distclean-compile \
+-clean-compile maintainer-clean-compile mostlyclean-libtool \
+-distclean-libtool clean-libtool maintainer-clean-libtool \
+-mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS install-man3 \
+-uninstall-man3 install-man uninstall-man uninstall-includeHEADERS \
+-install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
+-maintainer-clean-tags distdir info-am info dvi-am dvi check-local check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
++.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
++clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
++mostlyclean-compile distclean-compile clean-compile \
++maintainer-clean-compile mostlyclean-libtool distclean-libtool \
++clean-libtool maintainer-clean-libtool mostlyclean-libLTLIBRARIES \
++distclean-libLTLIBRARIES clean-libLTLIBRARIES \
++maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \
++install-libLTLIBRARIES mostlyclean-noinstPROGRAMS \
++distclean-noinstPROGRAMS clean-noinstPROGRAMS \
++maintainer-clean-noinstPROGRAMS install-man3 uninstall-man3 install-man \
++uninstall-man uninstall-includeHEADERS install-includeHEADERS tags \
++mostlyclean-tags distclean-tags clean-tags maintainer-clean-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 install-strip \
+ installdirs mostlyclean-generic distclean-generic clean-generic \
+diff -ruN heimdal-0.3c-old/lib/gssapi/Makefile.in heimdal-0.3c/lib/gssapi/Makefile.in
+--- heimdal-0.3c-old/lib/gssapi/Makefile.in	Wed Sep 20 20:55:37 2000
++++ heimdal-0.3c/lib/gssapi/Makefile.in	Tue Nov 28 09:56:26 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/hdb/Makefile.in heimdal-0.3c/lib/hdb/Makefile.in
+--- heimdal-0.3c-old/lib/hdb/Makefile.in	Wed Sep 20 20:55:38 2000
++++ heimdal-0.3c/lib/hdb/Makefile.in	Tue Nov 28 09:56:26 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/kadm5/Makefile.in heimdal-0.3c/lib/kadm5/Makefile.in
+--- heimdal-0.3c-old/lib/kadm5/Makefile.in	Wed Sep 20 20:55:39 2000
++++ heimdal-0.3c/lib/kadm5/Makefile.in	Tue Nov 28 09:56:26 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/kafs/Makefile.in heimdal-0.3c/lib/kafs/Makefile.in
+--- heimdal-0.3c-old/lib/kafs/Makefile.in	Wed Sep 20 20:55:40 2000
++++ heimdal-0.3c/lib/kafs/Makefile.in	Tue Nov 28 09:56:27 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/kdfs/Makefile.in heimdal-0.3c/lib/kdfs/Makefile.in
+--- heimdal-0.3c-old/lib/kdfs/Makefile.in	Wed Sep 20 20:55:41 2000
++++ heimdal-0.3c/lib/kdfs/Makefile.in	Tue Nov 28 09:56:27 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/krb5/Makefile.in heimdal-0.3c/lib/krb5/Makefile.in
+--- heimdal-0.3c-old/lib/krb5/Makefile.in	Wed Sep 20 20:55:41 2000
++++ heimdal-0.3c/lib/krb5/Makefile.in	Tue Nov 28 09:56:27 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -123,13 +126,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4)
++INCLUDES = -I$(top_builddir)/include $(INCLUDE_com_err) $(INCLUDE_krb4)
+ 
+ AM_CFLAGS =  $(WFLAGS) $(CPPFLAGS_roken)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -310,7 +320,7 @@
+ 
+ libkrb5_la_LDFLAGS = -version-info 13:1:0
+ 
+-libkrb5_la_LIBADD = ../com_err/error.lo ../com_err/com_err.lo
++libkrb5_la_LIBADD = $(LIB_com_err)
+ 
+ man_MANS = \
+ 	krb5.conf.5				\
+@@ -345,7 +355,7 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-libkrb5_la_DEPENDENCIES =  ../com_err/error.lo ../com_err/com_err.lo
++libkrb5_la_DEPENDENCIES = 
+ @KRB4_FALSE@am_libkrb5_la_OBJECTS =  acl.lo add_et_list.lo \
+ @KRB4_FALSE@addr_families.lo address.lo aname_to_localname.lo \
+ @KRB4_FALSE@appdefault.lo asn1_glue.lo auth_context.lo build_ap_req.lo \
+@@ -850,6 +860,8 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+diff -ruN heimdal-0.3c-old/lib/otp/Makefile.in heimdal-0.3c/lib/otp/Makefile.in
+--- heimdal-0.3c-old/lib/otp/Makefile.in	Wed Sep 20 20:55:42 2000
++++ heimdal-0.3c/lib/otp/Makefile.in	Tue Nov 28 09:56:28 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3c-old/lib/sl/Makefile.in heimdal-0.3c/lib/sl/Makefile.in
+--- heimdal-0.3c-old/lib/sl/Makefile.in	Wed Sep 20 20:55:43 2000
++++ heimdal-0.3c/lib/sl/Makefile.in	Tue Nov 28 09:56:28 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -170,6 +173,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ cat1dir = $(mandir)/cat1
+@@ -192,8 +202,6 @@
+ 
+ YFLAGS = -d
+ 
+-include_HEADERS = sl.h
+-
+ lib_LTLIBRARIES = libsl.la libss.la
+ libsl_la_LDFLAGS = -version-info 1:0:1
+ libss_la_LDFLAGS = -version-info 1:1:1
+@@ -219,7 +227,8 @@
+ EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
+ 
+ ssincludedir = $(includedir)/ss
+-ssinclude_HEADERS = ss.h
++buildssinclude = $(buildinclude)/ss
++ssinclude_HEADERS = sl.h ss.h
+ 
+ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
+ 
+@@ -264,11 +273,11 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(libsl_la_SOURCES) $(EXTRA_libsl_la_SOURCES) \
+ $(libss_la_SOURCES) $(mk_cmds_SOURCES) $(EXTRA_mk_cmds_SOURCES)
+-HEADERS =  $(include_HEADERS) $(ssinclude_HEADERS)
++HEADERS =  $(ssinclude_HEADERS)
+ 
+ depcomp = 
+-DIST_COMMON =  $(include_HEADERS) $(ssinclude_HEADERS) ChangeLog \
+-Makefile.am Makefile.in lex.c parse.c parse.h
++DIST_COMMON =  $(ssinclude_HEADERS) ChangeLog Makefile.am Makefile.in \
++lex.c parse.c parse.h
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -388,24 +397,6 @@
+ parse.h: parse.c
+ 
+ 
+-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; \
+-	  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 \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+-	done
+-
+ install-ssincludeHEADERS: $(ssinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(ssincludedir)
+@@ -481,20 +472,21 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-exec: install-exec-am
+ 
+-install-data-am: install-includeHEADERS install-ssincludeHEADERS \
+-		install-data-local
++install-data-am: install-ssincludeHEADERS install-data-local
+ install-data: install-data-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
+-		uninstall-includeHEADERS uninstall-ssincludeHEADERS
++		uninstall-ssincludeHEADERS
+ uninstall: uninstall-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
+ all-redirect: all-am
+@@ -502,7 +494,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ installdirs:
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+-		$(DESTDIR)$(includedir) $(DESTDIR)$(ssincludedir)
++		$(DESTDIR)$(ssincludedir)
+ 
+ 
+ mostlyclean-generic:
+@@ -552,9 +544,8 @@
+ mostlyclean-libtool distclean-libtool clean-libtool \
+ maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
+ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
+-install-binPROGRAMS uninstall-includeHEADERS install-includeHEADERS \
+-uninstall-ssincludeHEADERS install-ssincludeHEADERS tags \
+-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
++install-binPROGRAMS uninstall-ssincludeHEADERS install-ssincludeHEADERS \
++tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-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 \
+@@ -766,6 +757,19 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	fi
++
++install-build-headers:: $(ssinclude_HEADERS)
++	@foo='$(ssinclude_HEADERS)'; \
++	for f in $$foo; do \
++		f=`basename $$f`; \
++		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
++		else file="$$f"; fi; \
++		if cmp -s  $$file $(buildssinclude)/$$f 2> /dev/null ; then \
++		: ; else \
++			echo "cp $$file $(buildssinclude)/$$f";\
++			cp $$file $(buildssinclude)/$$f; \
++		fi ; \
++	done
+ 
+ $(mk_cmds_OBJECTS): parse.h
+ 
+diff -ruN heimdal-0.3c-old/lib/vers/Makefile.in heimdal-0.3c/lib/vers/Makefile.in
+--- heimdal-0.3c-old/lib/vers/Makefile.in	Wed Sep 20 20:55:43 2000
++++ heimdal-0.3c/lib/vers/Makefile.in	Tue Nov 28 09:56:28 2000
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,12 +69,14 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CPPFLAGS_roken = @CPPFLAGS_roken@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+ EXEEXT = @EXEEXT@
+@@ -89,6 +92,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -99,7 +103,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -129,7 +132,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -169,6 +172,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
--- heimdal-0.6.3.orig/debian/patches-0.3d/011_sharedlibs
+++ heimdal-0.6.3/debian/patches-0.3d/011_sharedlibs
@@ -0,0 +1,410 @@
+diff -ruN heimdal-0.3d-old/admin/Makefile.am heimdal-0.3d/admin/Makefile.am
+--- heimdal-0.3d-old/admin/Makefile.am	Thu Nov 16 09:51:06 2000
++++ heimdal-0.3d/admin/Makefile.am	Tue Dec 12 15:58:34 2000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline)
++INCLUDES += $(INCLUDE_readline) $(INCLUDE_ss)
+ 
+ man_MANS = ktutil.8
+ 
+@@ -24,6 +24,6 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+diff -ruN heimdal-0.3d-old/admin/ktutil_locl.h heimdal-0.3d/admin/ktutil_locl.h
+--- heimdal-0.3d-old/admin/ktutil_locl.h	Wed Jul 19 23:58:19 2000
++++ heimdal-0.3d/admin/ktutil_locl.h	Tue Dec 12 15:58:34 2000
+@@ -60,7 +60,7 @@
+ #include <kadm5/admin.h>
+ #include <kadm5/kadm5_err.h>
+ 
+-#include <sl.h>
++#include <ss.h>
+ #include <getarg.h>
+ 
+ extern krb5_context context;
+diff -ruN heimdal-0.3d-old/cf/Makefile.am.common heimdal-0.3d/cf/Makefile.am.common
+--- heimdal-0.3d-old/cf/Makefile.am.common	Tue Dec  5 20:11:09 2000
++++ heimdal-0.3d/cf/Makefile.am.common	Tue Dec 12 15:58:34 2000
+@@ -10,7 +10,7 @@
+ 
+ CP	= cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ ## set build_HEADERZ to headers that should just be installed in build tree
+ 
+@@ -56,6 +56,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ LIB_readline = @LIB_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/cf/krb-com_err.m4 heimdal-0.3d/cf/krb-com_err.m4
+--- heimdal-0.3d-old/cf/krb-com_err.m4	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3d/cf/krb-com_err.m4	Tue Dec 12 15:58:34 2000
+@@ -0,0 +1,35 @@
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_COM_ERR,[
++dnl com_err
++
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++AC_DEFINE(HAVE_COM_ERR, 1, 
++	[Define if you have a com_err compatible library.])dnl
++
++])
++AC_SUBST(COMPILE_ET)
+diff -ruN heimdal-0.3d-old/cf/krb-readline.m4 heimdal-0.3d/cf/krb-readline.m4
+--- heimdal-0.3d-old/cf/krb-readline.m4	Wed Nov 15 11:47:08 2000
++++ heimdal-0.3d/cf/krb-readline.m4	Tue Dec 12 16:04:28 2000
+@@ -28,16 +28,18 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init"
+ else
++	DIR_readline="editline"
+ 	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ AC_DEFINE(HAVE_READLINE, 1, 
+ 	[Define if you have a readline compatible library.])dnl
+ 
+-])
+\ No newline at end of file
++])
+diff -ruN heimdal-0.3d-old/cf/krb-ss.m4 heimdal-0.3d/cf/krb-ss.m4
+--- heimdal-0.3d-old/cf/krb-ss.m4	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3d/cf/krb-ss.m4	Tue Dec 12 15:58:34 2000
+@@ -0,0 +1,36 @@
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_SS,[
++dnl com_err
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++AC_DEFINE(HAVE_SS, 1, 
++	[Define if you have a ss compatible library.])dnl
++
++])
++AC_SUBST(LIB_sl)
+diff -ruN heimdal-0.3d-old/cf/test-package.m4 heimdal-0.3d/cf/test-package.m4
+--- heimdal-0.3d-old/cf/test-package.m4	Sun Jul 16 04:08:58 2000
++++ heimdal-0.3d/cf/test-package.m4	Tue Dec 12 15:58:34 2000
+@@ -2,7 +2,7 @@
+ dnl
+ dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+ 
+-AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
++AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
+ 
+ AC_DEFUN(AC_TEST_PACKAGE_NEW,[
+ AC_ARG_WITH($1,
+@@ -39,7 +39,7 @@
+ header_dirs=
+ lib_dirs=
+ d='$5'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -72,6 +72,7 @@
+ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+ 	$1_includedir="$ires"
+ 	$1_libdir="$lres"
++	DIR_$1=
+ 	INCLUDE_$1="-I$$1_includedir"
+ 	LIB_$1="-L$$1_libdir $3"
+ 	ifval([$6],
+@@ -80,6 +81,7 @@
+ 	with_$1=yes
+ 	AC_MSG_RESULT([headers $ires, libraries $lres])
+ else
++	DIR_$1="$1"
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	with_$1=no
+@@ -88,6 +90,7 @@
+ dnl ifval([$6],
+ dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
+ dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+diff -ruN heimdal-0.3d-old/configure.in heimdal-0.3d/configure.in
+--- heimdal-0.3d-old/configure.in	Mon Dec 11 14:19:36 2000
++++ heimdal-0.3d/configure.in	Tue Dec 12 15:58:34 2000
+@@ -228,6 +228,12 @@
+ [#include <stdio.h>
+  #include <readline.h>],-lreadline,,, READLINE)
+ 
++AC_TEST_PACKAGE_NEW(com_err,
++[#include <et/com_err.h>],-lcom_err,,, COM_ERR)
++
++AC_TEST_PACKAGE_NEW(ss,
++[#include <ss.h>],-lss,,, SS)
++
+ AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
+ 
+ KRB_C_BIGENDIAN
+@@ -570,6 +576,8 @@
+ AC_SUBST(LIB_des)
+ 
+ KRB_READLINE
++KRB_COM_ERR
++KRB_SS
+ 
+ dnl telnet muck --------------------------------------------------
+ 
+diff -ruN heimdal-0.3d-old/include/ss/Makefile.am heimdal-0.3d/include/ss/Makefile.am
+--- heimdal-0.3d-old/include/ss/Makefile.am	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3d/include/ss/Makefile.am	Tue Dec 12 15:58:34 2000
+@@ -0,0 +1,5 @@
++# $Id: Makefile.am,v 1.6 1999/03/20 13:58:17 joda Exp $
++
++include $(top_srcdir)/Makefile.am.common
++
++CLEANFILES = ss.h sl.h
+diff -ruN heimdal-0.3d-old/kadmin/Makefile.am heimdal-0.3d/kadmin/Makefile.am
+--- heimdal-0.3d-old/kadmin/Makefile.am	Thu Nov 16 09:51:12 2000
++++ heimdal-0.3d/kadmin/Makefile.am	Tue Dec 12 15:58:34 2000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
++INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_ss) -I$(srcdir)/../lib/krb5
+ 
+ sbin_PROGRAMS = kadmin
+ 
+@@ -62,7 +62,7 @@
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(COMMON_LDADD) \
+ 	$(LIB_dlopen)
+diff -ruN heimdal-0.3d-old/kadmin/kadmin.c heimdal-0.3d/kadmin/kadmin.c
+--- heimdal-0.3d-old/kadmin/kadmin.c	Mon Sep 11 06:20:49 2000
++++ heimdal-0.3d/kadmin/kadmin.c	Tue Dec 12 15:58:34 2000
+@@ -32,7 +32,7 @@
+  */
+ 
+ #include "kadmin_locl.h"
+-#include <sl.h>
++#include <ss.h>
+ 
+ RCSID("$Id: kadmin.c,v 1.32 2000/09/10 19:20:49 joda Exp $");
+ 
+diff -ruN heimdal-0.3d-old/lib/Makefile.am heimdal-0.3d/lib/Makefile.am
+--- heimdal-0.3d-old/lib/Makefile.am	Thu Nov 16 10:11:05 2000
++++ heimdal-0.3d/lib/Makefile.am	Tue Dec 12 16:08:42 2000
+@@ -12,5 +12,5 @@
+ dir_dce = kdfs
+ endif
+ 
+-SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 @DIR_des@ krb5 \
++SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ asn1 @DIR_des@ krb5 \
+ 	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+diff -ruN heimdal-0.3d-old/lib/asn1/Makefile.am heimdal-0.3d/lib/asn1/Makefile.am
+--- heimdal-0.3d-old/lib/asn1/Makefile.am	Tue Jul 25 20:35:19 2000
++++ heimdal-0.3d/lib/asn1/Makefile.am	Tue Dec 12 15:58:34 2000
+@@ -2,6 +2,8 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
++INCLUDES += $(INCLUDE_com_err)
++
+ YFLAGS = -d
+ 
+ lib_LTLIBRARIES = libasn1.la
+@@ -82,11 +84,11 @@
+ 	$(BUILT_SOURCES)
+ 
+ asn1_compile_LDADD = \
+-	$(LIB_roken) $(LEXLIB)
++        $(LIB_roken) $(LEXLIB)
+ 
+ check_der_LDADD = \
+ 	libasn1.la \
+-	../com_err/libcom_err.la \
++	$(LIB_com_err) \
+ 	$(LIB_roken)
+ 
+ asn1_print_LDADD = $(check_der_LDADD)
+diff -ruN heimdal-0.3d-old/lib/asn1/libasn1.h heimdal-0.3d/lib/asn1/libasn1.h
+--- heimdal-0.3d-old/lib/asn1/libasn1.h	Fri Dec  3 04:05:02 1999
++++ heimdal-0.3d/lib/asn1/libasn1.h	Tue Dec 12 15:58:34 2000
+@@ -47,4 +47,17 @@
+ #include "asn1_err.h"
+ #include <parse_units.h>
+ 
++#ifdef HACKED_AND_STUPID
++#define ASN1_BAD_TIMEFORMAT BAD_TIMEFORMAT
++#define ASN1_MISSING_FIELD MISSING_FIELD
++#define ASN1_MISPLACED_FIELD MISPLACED_FIELD
++#define ASN1_TYPE_MISMATCH TYPE_MISMATCH
++#define ASN1_OVERFLOW OVERFLOW
++#define ASN1_OVERRUN OVERRUN
++#define ASN1_BAD_ID BAD_ID
++#define ASN1_BAD_LENGTH BAD_LENGTH
++#define ASN1_BAD_FORMAT BAD_FORMAT
++#define ASN1_PARSE_ERROR PARSE_ERROR
++#endif
++
+ #endif /* __LIBASN1_H__ */
+diff -ruN heimdal-0.3d-old/lib/auth/sia/Makefile.am heimdal-0.3d/lib/auth/sia/Makefile.am
+--- heimdal-0.3d-old/lib/auth/sia/Makefile.am	Mon Nov  6 04:16:36 2000
++++ heimdal-0.3d/lib/auth/sia/Makefile.am	Tue Dec 12 15:58:34 2000
+@@ -24,7 +24,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.a		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
++	@LIB_sl@
+ 	$(top_builddir)/lib/roken/.libs/libroken.a	\
+ 	$(LIB_getpwnam_r)				\
+ 	-lc
+@@ -35,7 +35,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.so		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
++	@LIB_sl@
+ 	$(top_builddir)/lib/roken/.libs/libroken.so	\
+ 	$(LIB_getpwnam_r)				\
+ 	-lc
+diff -ruN heimdal-0.3d-old/lib/krb5/Makefile.am heimdal-0.3d/lib/krb5/Makefile.am
+--- heimdal-0.3d-old/lib/krb5/Makefile.am	Mon Dec 11 11:40:35 2000
++++ heimdal-0.3d/lib/krb5/Makefile.am	Tue Dec 12 16:11:55 2000
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_krb4)
++INCLUDES += $(INCLUDE_com_err) $(INCLUDE_krb4)
+ 
+ bin_PROGRAMS = verify_krb5_conf
+ 
+@@ -23,7 +23,7 @@
+ 	$(LIB_roken)
+ 
+ libkrb5_la_LIBADD = \
+-	../com_err/error.lo ../com_err/com_err.lo \
++	$(LIB_com_err) \
+ 	$(KRB4LIB) \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+diff -ruN heimdal-0.3d-old/lib/sl/Makefile.am heimdal-0.3d/lib/sl/Makefile.am
+--- heimdal-0.3d-old/lib/sl/Makefile.am	Mon Dec 11 11:45:34 2000
++++ heimdal-0.3d/lib/sl/Makefile.am	Tue Dec 12 15:58:34 2000
+@@ -4,8 +4,6 @@
+ 
+ YFLAGS = -d
+ 
+-include_HEADERS = sl.h
+-
+ lib_LTLIBRARIES = libsl.la libss.la
+ libsl_la_LDFLAGS = -version-info 1:0:1
+ libss_la_LDFLAGS = -version-info 1:2:1
+@@ -31,7 +29,21 @@
+ EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
+ 
+ ssincludedir = $(includedir)/ss
+-ssinclude_HEADERS = ss.h
++buildssinclude = $(buildinclude)/ss
++ssinclude_HEADERS = sl.h ss.h
++
++install-build-headers:: $(ssinclude_HEADERS)
++	@foo='$(ssinclude_HEADERS)'; \
++	for f in $$foo; do \
++		f=`basename $$f`; \
++		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
++		else file="$$f"; fi; \
++		if cmp -s  $$file $(buildssinclude)/$$f 2> /dev/null ; then \
++		: ; else \
++			echo "cp $$file $(buildssinclude)/$$f";\
++			cp $$file $(buildssinclude)/$$f; \
++		fi ; \
++	done
+ 
+ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
+ 
--- heimdal-0.6.3.orig/debian/patches-0.3d/001_replay
+++ heimdal-0.6.3/debian/patches-0.3d/001_replay
@@ -0,0 +1,13 @@
+diff -u -r1.2 replay.c
+--- heimdal-0.3d/lib/krb5/replay.c	2000/12/12 15:50:14	1.2
++++ heimdal-0.3d/lib/krb5/replay.c	2000/12/13 21:25:47
+@@ -156,7 +156,7 @@
+ 		  strlen(auth->cname.name_string.val[i]));
+     MD5Update (&md5, &auth->ctime, sizeof(auth->ctime));
+     MD5Update (&md5, &auth->cusec, sizeof(auth->cusec));
+-    MD5Final (&md5, data);
++    MD5Final (data, &md5);
+ }
+ 
+ krb5_error_code
+
--- heimdal-0.6.3.orig/debian/patches-0.3d/002_libvers
+++ heimdal-0.6.3/debian/patches-0.3d/002_libvers
@@ -0,0 +1,11 @@
+diff -ruN heimdal-0.3d-old/lib/vers/Makefile.am heimdal-0.3d/lib/vers/Makefile.am
+--- heimdal-0.3d-old/lib/vers/Makefile.am	Thu Nov 16 08:15:35 2000
++++ heimdal-0.3d/lib/vers/Makefile.am	Wed Dec 20 14:08:09 2000
+@@ -5,7 +5,6 @@
+ CLEANFILES		= print_version.h
+ 
+ noinst_LTLIBRARIES	= libvers.la
+-libvers_la_LDFLAGS	= -static
+ 
+ build_HEADERZ		= vers.h
+ 
--- heimdal-0.6.3.orig/debian/patches-0.3d/010_openssl
+++ heimdal-0.6.3/debian/patches-0.3d/010_openssl
@@ -0,0 +1,540 @@
+This patch is meant to be used with Heimdal. It can be used and distributed
+under the same conditions as Heimdal itself.
+
+diff -u -r heimdal-0.3d.orig/admin/ktutil_locl.h heimdal/admin/ktutil_locl.h
+--- heimdal-0.3d.orig/admin/ktutil_locl.h	Wed Jul 19 15:58:19 2000
++++ heimdal/admin/ktutil_locl.h	Sat Jan  6 12:03:20 2001
+@@ -54,7 +54,11 @@
+ #include <parse_time.h>
+ #include <roken.h>
+ 
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ 
+ #include <krb5.h>
+ #include <kadm5/admin.h>
+diff -u -r heimdal-0.3d.orig/appl/ftp/ftp/ftp_locl.h heimdal/appl/ftp/ftp/ftp_locl.h
+--- heimdal-0.3d.orig/appl/ftp/ftp/ftp_locl.h	Thu Dec  2 17:58:29 1999
++++ heimdal/appl/ftp/ftp/ftp_locl.h	Sat Jan  6 12:03:20 2001
+@@ -129,7 +129,12 @@
+ 
+ #include "roken.h"
+ #include "security.h"
+-#include <des.h> /* for des_read_pw_string */
++
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
++#include <des.h>
++#endif
+ 
+ #if defined(__sun__) && !defined(__svr4)
+ int fclose(FILE*);
+diff -u -r heimdal-0.3d.orig/appl/kx/common.c heimdal/appl/kx/common.c
+--- heimdal-0.3d.orig/appl/kx/common.c	Wed Aug  9 22:53:02 2000
++++ heimdal/appl/kx/common.c	Sat Jan  6 12:03:20 2001
+@@ -405,7 +405,7 @@
+      auth.name_length = strlen(auth.name);
+      auth.data_length = cookie_sz;
+      auth.data = (char*)cookie;
+-     des_rand_data (cookie, cookie_sz);
++     krb5_generate_random_block (cookie, cookie_sz);
+ 
+      strlcpy(xauthfile, "/tmp/AXXXXXX", xauthfile_size);
+      fd = mkstemp(xauthfile);
+diff -u -r heimdal-0.3d.orig/appl/otp/otp_locl.h heimdal/appl/otp/otp_locl.h
+--- heimdal-0.3d.orig/appl/otp/otp_locl.h	Thu Dec  2 17:58:32 1999
++++ heimdal/appl/otp/otp_locl.h	Sat Jan  6 12:03:20 2001
+@@ -52,5 +52,9 @@
+ #endif
+ #include <roken.h>
+ #include <err.h>
+-#include <des.h>
+ #include <otp.h>
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
++#include <des.h>
++#endif
+diff -u -r heimdal-0.3d.orig/appl/su/su.c heimdal/appl/su/su.c
+--- heimdal-0.3d.orig/appl/su/su.c	Mon Oct  2 07:06:01 2000
++++ heimdal/appl/su/su.c	Sat Jan  6 12:03:20 2001
+@@ -50,7 +50,11 @@
+ 
+ #include <pwd.h>
+ 
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <kafs.h>
+ #include <err.h>
+diff -u -r heimdal-0.3d.orig/appl/telnet/libtelnet/enc_des.c heimdal/appl/telnet/libtelnet/enc_des.c
+--- heimdal-0.3d.orig/appl/telnet/libtelnet/enc_des.c	Fri Jul 10 01:16:23 1998
++++ heimdal/appl/telnet/libtelnet/enc_des.c	Sat Jan  6 12:03:20 2001
+@@ -50,8 +50,6 @@
+ #include "encrypt.h"
+ #include "misc-proto.h"
+ 
+-#include <des.h>
+-
+ extern int encrypt_debug_mode;
+ 
+ #define	CFB	0
+@@ -208,19 +206,7 @@
+ 		/*
+ 		 * Create a random feed and send it over.
+ 		 */
+-#ifndef OLD_DES_RANDOM_KEY
+ 		des_new_random_key(&fbp->temp_feed);
+-#else
+-		/*
+-		 * From des_cryp.man "If the des_check_key flag is non-zero,
+-		 *  des_set_key will check that the key passed is
+-		 *  of odd parity and is not a week or semi-weak key."
+-		 */
+-		do {
+-			des_random_key(fbp->temp_feed);
+-			des_set_odd_parity(fbp->temp_feed);
+-		} while (des_is_weak_key(fbp->temp_feed));
+-#endif
+ 		des_ecb_encrypt(&fbp->temp_feed,
+ 				&fbp->temp_feed,
+ 				fbp->krbdes_sched, 1);
+@@ -404,7 +390,7 @@
+ 	fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]);
+ 
+ 	if (fbp->once == 0) {
+-#ifndef OLD_DES_RANDOM_KEY
++#ifndef HAVE_OPENSSL_CRYPTO_H
+ 		des_init_random_number_generator(&fbp->krbdes_key);
+ #endif
+ 		fbp->once = 1;
+diff -u -r heimdal-0.3d.orig/appl/telnet/libtelnet/encrypt.h heimdal/appl/telnet/libtelnet/encrypt.h
+--- heimdal-0.3d.orig/appl/telnet/libtelnet/encrypt.h	Sat Jan 25 00:10:56 1997
++++ heimdal/appl/telnet/libtelnet/encrypt.h	Sat Jan  6 12:03:20 2001
+@@ -90,6 +90,13 @@
+ 
+ #define	SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
+ 
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#define des_new_random_key des_random_key
++#else
++#include <des.h>
++#endif
++
+ #include "enc-proto.h"
+ 
+ extern int encrypt_debug_mode;
+diff -u -r heimdal-0.3d.orig/appl/telnet/libtelnet/kerberos.c heimdal/appl/telnet/libtelnet/kerberos.c
+--- heimdal-0.3d.orig/appl/telnet/libtelnet/kerberos.c	Thu Nov 23 03:28:06 2000
++++ heimdal/appl/telnet/libtelnet/kerberos.c	Sat Jan  6 12:03:20 2001
+@@ -65,7 +65,6 @@
+ #include <arpa/telnet.h>
+ #endif
+ #include <stdio.h>
+-#include <des.h>	/* BSD wont include this in krb.h, so we do it here */
+ #include <krb.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+diff -u -r heimdal-0.3d.orig/appl/telnet/libtelnet/krb4encpwd.c heimdal/appl/telnet/libtelnet/krb4encpwd.c
+--- heimdal-0.3d.orig/appl/telnet/libtelnet/krb4encpwd.c	Thu Sep 16 22:41:34 1999
++++ heimdal/appl/telnet/libtelnet/krb4encpwd.c	Sat Jan  6 12:03:20 2001
+@@ -74,7 +74,6 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ 
+-#include <des.h>
+ #include <krb.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff -u -r heimdal-0.3d.orig/configure.in heimdal/configure.in
+--- heimdal-0.3d.orig/configure.in	Mon Dec 11 04:19:36 2000
++++ heimdal/configure.in	Sat Jan  6 12:03:20 2001
+@@ -292,6 +292,7 @@
+ 	netinet/in_systm.h			\
+ 	netinet6/in6.h				\
+ 	netinfo/ni.h				\
++	openssl/crypto.h			\
+ 	paths.h					\
+ 	pthread.h				\
+ 	pty.h					\
+@@ -547,21 +548,35 @@
+ dnl crypto functions tests
+ dnl
+ 
+-AC_FIND_FUNC_NO_LIBS2(MD4Init, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(MD4_Init, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(MD5Init, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(MD5_Init, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(SHA1Init, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(SHA1_Init, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(des_cbc_encrypt, crypto des, [], [], [], [$LIB_krb4])
+-AC_FIND_FUNC_NO_LIBS2(RC4, crypto des, [], [], [], [$LIB_krb4])
++if test "$with_krb4" != "no"; then
++  DESLIBS="crypto des"
++else
++  DESLIBS="crypto"
++fi
++
++AC_FIND_FUNC_NO_LIBS2(MD4Init, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(MD4_Init, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(MD5Init, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(MD5_Init, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(SHA1Init, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(SHA1_Init, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(des_cbc_encrypt, $DESLIBS, [], [], [], [$LIB_krb4])
++AC_FIND_FUNC_NO_LIBS2(RC4, $DESLIBS, [], [], [], [$LIB_krb4])
+ if test "$ac_cv_func_des_cbc_encrypt" = "yes" -a \
+ \( "$ac_cv_func_MD4Init"  = "yes" -o "$ac_cv_func_MD4_Init"  = "yes" \) -a \
+ \( "$ac_cv_func_MD5Init"  = "yes" -o "$ac_cv_func_MD5_Init"  = "yes" \) -a \
+ \( "$ac_cv_func_SHA1Init" = "yes" -o "$ac_cv_func_SHA1_Init" = "yes" \) -a \
+ "$ac_cv_func_RC4" = "yes"; then
+   DIR_des=''
+-  LIB_des="-rpath $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4Init"
++  LIB_des=''
++  if test "$krb4_libdir" != ""; then
++    LIB_des="-rpath $krb4_libdir -L$krb4_libdir"
++  fi
++  if test "$ac_cv_func_MD4Init" = "yes"; then
++    LIB_des="$LIB_des $ac_cv_funclib_MD4Init"
++  else
++    LIB_des="$LIB_des $ac_cv_funclib_MD4_Init"
++  fi
+ else
+   DIR_des='des'
+   LIB_des='$(top_builddir)/lib/des/libdes.la'
+diff -u -r heimdal-0.3d.orig/kadmin/kadmin_locl.h heimdal/kadmin/kadmin_locl.h
+--- heimdal-0.3d.orig/kadmin/kadmin_locl.h	Tue Sep 19 14:46:18 2000
++++ heimdal/kadmin/kadmin_locl.h	Sat Jan  6 12:03:20 2001
+@@ -83,7 +83,11 @@
+ #endif
+ #include <err.h>
+ #include <roken.h>
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <krb5_locl.h>
+ #include <hdb.h>
+diff -u -r heimdal-0.3d.orig/kadmin/random_password.c heimdal/kadmin/random_password.c
+--- heimdal-0.3d.orig/kadmin/random_password.c	Thu Dec  2 18:04:58 1999
++++ heimdal/kadmin/random_password.c	Sat Jan  6 12:03:20 2001
+@@ -57,9 +57,9 @@
+ {
+ #ifdef OTP_STYLE
+     {
+-	des_cblock newkey;
++	OtpKey newkey;
+ 
+-	des_new_random_key(&newkey);
++	krb5_generate_random_block(&newkey, sizeof(newkey));
+ 	otp_print_stddict (newkey, pw, len);
+ 	strlwr(pw);
+     }
+@@ -80,11 +80,11 @@
+ #ifndef OTP_STYLE
+ /* return a random value in range 0-127 */
+ static int
+-RND(des_cblock *key, int *left)
++RND(unsigned char *key, int keylen, int *left)
+ {
+     if(*left == 0){
+-	des_new_random_key(key);
+-	*left = 8;
++	krb5_generate_random_block(key, keylen);
++	*left = keylen;
+     }
+     (*left)--;
+     return ((unsigned char*)key)[*left];
+@@ -120,7 +120,7 @@
+     } *classes;
+     va_list ap;
+     int len, i;
+-    des_cblock rbuf; /* random buffer */
++    unsigned char rbuf[8]; /* random buffer */
+     int rleft = 0;
+ 
+     classes = malloc(num_classes * sizeof(*classes));
+@@ -138,11 +138,12 @@
+ 	return;
+     for(i = 0; i < len; i++) {
+ 	int j;
+-	int x = RND(&rbuf, &rleft) % (len - i);
++	int x = RND(rbuf, sizeof(rbuf), &rleft) % (len - i);
+ 	int t = 0;
+ 	for(j = 0; j < num_classes; j++) {
+ 	    if(x < t + classes[j].freq) {
+-		(*pw)[i] = classes[j].str[RND(&rbuf, &rleft) % classes[j].len];
++		(*pw)[i] = classes[j].str[RND(rbuf, sizeof(rbuf), &rleft) %
++		    classes[j].len];
+ 		classes[j].freq--;
+ 		break;
+ 	    }
+diff -u -r heimdal-0.3d.orig/kdc/headers.h heimdal/kdc/headers.h
+--- heimdal-0.3d.orig/kdc/headers.h	Fri Aug  4 13:21:38 2000
++++ heimdal/kdc/headers.h	Sat Jan  6 12:03:20 2001
+@@ -82,7 +82,11 @@
+ #include <getarg.h>
+ #include <base64.h>
+ #include <parse_units.h>
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <krb5_locl.h>
+ #include <hdb.h>
+diff -u -r heimdal-0.3d.orig/kpasswd/kpasswd_locl.h heimdal/kpasswd/kpasswd_locl.h
+--- heimdal-0.3d.orig/kpasswd/kpasswd_locl.h	Fri Aug  4 13:22:51 2000
++++ heimdal/kpasswd/kpasswd_locl.h	Sat Jan  6 12:03:20 2001
+@@ -95,7 +95,11 @@
+ #include <err.h>
+ #include <roken.h>
+ #include <getarg.h>
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ 
+ #endif /* __KPASSWD_LOCL_H__ */
+diff -u -r heimdal-0.3d.orig/lib/hdb/hdb_locl.h heimdal/lib/hdb/hdb_locl.h
+--- heimdal-0.3d.orig/lib/hdb/hdb_locl.h	Tue Nov 14 07:57:17 2000
++++ heimdal/lib/hdb/hdb_locl.h	Sat Jan  6 12:03:21 2001
+@@ -56,7 +56,11 @@
+ #endif
+ #include <roken.h>
+ 
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <hdb.h>
+ #include <hdb-private.h>
+diff -u -r heimdal-0.3d.orig/lib/hdb/mkey.c heimdal/lib/hdb/mkey.c
+--- heimdal-0.3d.orig/lib/hdb/mkey.c	Sat Jul  8 18:03:59 2000
++++ heimdal/lib/hdb/mkey.c	Sat Jan  6 12:03:21 2001
+@@ -387,9 +387,6 @@
+     if (ret)
+ 	return ret;
+     db->master_key = mkey;
+-#if 0 /* XXX - why? */
+-    des_set_random_generator_seed(key.keyvalue.data);
+-#endif
+     db->master_key_set = 1;
+     return 0;
+ }
+diff -u -r heimdal-0.3d.orig/lib/krb5/crypto.c heimdal/lib/krb5/crypto.c
+--- heimdal-0.3d.orig/lib/krb5/crypto.c	Fri Dec  8 06:01:31 2000
++++ heimdal/lib/krb5/crypto.c	Sun Jan  7 17:03:16 2001
+@@ -2529,6 +2529,71 @@
+  *                                                          *
+  ************************************************************/
+ 
++#ifdef HAVE_OPENSSL_CRYPTO_H
++/* From openssl/crypto/rand/rand_lcl.h */
++#define ENTROPY_NEEDED 20
++static int seed_something(void)
++{
++    int fd = -1;
++    size_t len;
++    char buf[1024], seedfile[256];
++
++    /* If there is a seed file, load it. But such a file cannot be trusted,
++       so use 0 for the entropy estimate */
++    if (RAND_file_name(seedfile, sizeof(seedfile))) {
++	fd = open(seedfile, O_RDONLY);
++	if (fd >= 0) {
++	    read(fd, buf, sizeof(buf));
++	    /* Use the full buffer anyway */
++	    RAND_add(buf, sizeof(buf), 0.0);
++	}
++	else
++	    seedfile[0] = '\0';
++    }
++    else
++	seedfile[0] = '\0';
++
++    /* Calling RAND_status() will try to use /dev/urandom if it exists so
++       we do not have to deal with it. */
++    if (RAND_status() != 1) {
++	krb5_context context;
++	char *p;
++
++	/* Try using egd */
++	if (!krb5_init_context(&context)) {
++	    p = krb5_config_get_string(context, NULL, "libdefaults",
++		"egd_socket", NULL);
++	    if (p != NULL)
++		RAND_egd_bytes(p, ENTROPY_NEEDED);
++	    krb5_free_context(context);
++	}
++    }
++    
++    if (RAND_status() == 1)	{
++	/* Update the seed file */
++	if (seedfile[0])
++	    RAND_write_file(seedfile);
++
++	return 0;
++    }
++    else
++	return -1;
++}
++
++void
++krb5_generate_random_block(void *buf, size_t len)
++{
++    static int rng_initialized = 0;
++    
++    if (!rng_initialized) {
++	if (seed_something())
++	    krb5_abortx(NULL, "Fatal: could not seed the random number generator");
++	
++	rng_initialized = 1;
++    }
++    RAND_bytes(buf, len);
++}
++#else
+ void
+ krb5_generate_random_block(void *buf, size_t len)
+ {
+@@ -2554,6 +2619,7 @@
+ 	buf = (char*)buf + sizeof(out);
+     }
+ }
++#endif
+ 
+ static void
+ DES3_postproc(krb5_context context,
+diff -u -r heimdal-0.3d.orig/lib/krb5/krb5_locl.h heimdal/lib/krb5/krb5_locl.h
+--- heimdal-0.3d.orig/lib/krb5/krb5_locl.h	Thu Dec  2 18:05:11 1999
++++ heimdal/lib/krb5/krb5_locl.h	Sat Jan  6 12:03:21 2001
+@@ -109,11 +109,40 @@
+ #include <parse_time.h>
+ #include <base64.h>
+ 
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/des.h>
++#include <openssl/md4.h>
++#include <openssl/md5.h>
++#include <openssl/sha.h>
++#include <openssl/rc4.h>
++#include <openssl/blowfish.h>
++#include <openssl/rand.h>
++#define des_new_random_key des_random_key
++#else
+ #include <des.h>
+ #include <md4.h>
+ #include <md5.h>
+ #include <sha.h>
+ #include <rc4.h>
++#endif
++
++/* Compatibility stuff */
++#if defined(HAVE_MD4_INIT) && !defined(HAVE_MD4INIT)
++#define MD4Init		MD4_Init
++#define MD4Update	MD4_Update
++#define MD4Final	MD4_Final
++#endif
++#if defined(HAVE_MD5_INIT) && !defined(HAVE_MD5INIT)
++#define MD5Init		MD5_Init
++#define MD5Update	MD5_Update
++#define MD5Final	MD5_Final
++#endif
++#if defined(HAVE_SHA1_INIT) && !defined(HAVE_SHA1INIT)
++#define SHA1_CTX	SHA_CTX
++#define SHA1Init	SHA1_Init
++#define SHA1Update	SHA1_Update
++#define SHA1Final	SHA1_Final
++#endif
+ 
+ #include <asn1.h>
+ #include <der.h>
+diff -u -r heimdal-0.3d.orig/lib/otp/otp_md.c heimdal/lib/otp/otp_md.c
+--- heimdal-0.3d.orig/lib/otp/otp_md.c	Wed Jul 12 02:26:43 2000
++++ heimdal/lib/otp/otp_md.c	Sat Jan  6 12:03:21 2001
+@@ -38,9 +38,34 @@
+ #include "otp_locl.h"
+ 
+ #include "otp_md.h"
++
++#ifdef HAVE_OPENSSL_CRYPTO_H
++#include <openssl/md4.h>
++#include <openssl/md5.h>
++#include <openssl/sha.h>
++#else
+ #include <md4.h>
+ #include <md5.h>
+ #include <sha.h>
++#endif
++
++/* Compatibility stuff */
++#if defined(HAVE_MD4_INIT) && !defined(HAVE_MD4INIT)
++#define MD4Init		MD4_Init
++#define MD4Update	MD4_Update
++#define MD4Final	MD4_Final
++#endif
++#if defined(HAVE_MD5_INIT) && !defined(HAVE_MD5INIT)
++#define MD5Init		MD5_Init
++#define MD5Update	MD5_Update
++#define MD5Final	MD5_Final
++#endif
++#if defined(HAVE_SHA1_INIT) && !defined(HAVE_SHA1INIT)
++#define SHA1_CTX	SHA_CTX
++#define SHA1Init	SHA1_Init
++#define SHA1Update	SHA1_Update
++#define SHA1Final	SHA1_Final
++#endif
+ 
+ /*
+  * Compress len bytes from md into key
+@@ -212,7 +237,7 @@
+  */
+ 
+ static void
+-SHA1Final_little_endian (void *res, struct sha1 *m)
++SHA1Final_little_endian (void *res, SHA1_CTX *m)
+ {
+   unsigned char tmp[20];
+   unsigned char *p = res;
+@@ -231,7 +256,7 @@
+ otp_sha_init (OtpKey key, const char *pwd, const char *seed)
+ {
+   unsigned char res[20];
+-  struct sha1 sha1;
++  SHA1_CTX sha1;
+ 
+   return otp_md_init (key, pwd, seed, 
+ 		      (void (*)(void *))SHA1Init, 
+@@ -245,7 +270,7 @@
+ 	      size_t len,
+ 	      unsigned char *res)
+ {
+-  struct sha1 sha1;
++  SHA1_CTX sha1;
+ 
+   return otp_md_hash (data, len,
+ 		      (void (*)(void *))SHA1Init,
+@@ -258,7 +283,7 @@
+ otp_sha_next (OtpKey key)
+ {
+   unsigned char res[20];
+-  struct sha1 sha1;
++  SHA1_CTX sha1;
+ 
+   return otp_md_next (key, 
+ 		      (void (*)(void *))SHA1Init, 
--- heimdal-0.6.3.orig/debian/patches-0.3d/014_krb5-config
+++ heimdal-0.6.3/debian/patches-0.3d/014_krb5-config
@@ -0,0 +1,44 @@
+From: GOMBAS Gabor <gombasg@inf.elte.hu>
+Subject: Re: OpenSSL patch for Heimdal 0.3d
+To: Brian May <bam@snoopy.apana.org.au>
+Cc: heimdal-discuss@sics.se
+Date: Mon, 8 Jan 2001 15:07:31 +0100
+
+On Mon, Jan 08, 2001 at 12:44:06PM +1100, Brian May wrote:
+
+> 1. It still includes -ldes, not -lcrypto
+> 2. It fails to specify -lcom_err
+
+How about the following patch:
+
+diff -u -r heimdal-0.3d.orig/tools/Makefile.am heimdal/tools/Makefile.am
+--- heimdal-0.3d.orig/tools/Makefile.am	Fri Dec  1 06:05:27 2000
++++ heimdal/tools/Makefile.am	Mon Jan  8 14:55:48 2001
+@@ -19,6 +19,7 @@
+ 		-e "s,@includedir\@,$(includedir),g" \
+ 		-e "s,@LIB_crypt\@,$(LIB_crypt),g" \
+ 		-e "s,@LIB_dbopen\@,$(LIB_dbopen),g" \
++		-e "s,@LIB_des\@,$(LIB_des),g" \
+ 		-e "s,@LIBS\@,$(LIBS),g" \
+ 		$(srcdir)/krb5-config.in > $@
+ 	chmod +x $@
+diff -u -r heimdal-0.3d.orig/tools/krb5-config.in heimdal/tools/krb5-config.in
+--- heimdal-0.3d.orig/tools/krb5-config.in	Fri Dec  1 05:58:54 2000
++++ heimdal/tools/krb5-config.in	Mon Jan  8 14:56:09 2001
+@@ -99,7 +99,7 @@
+ 	echo -n " -lkadm5srv"
+ 	;;
+     esac
+-    echo " -lkrb5 -lasn1 -ldes -lroken @LIB_crypt@ @LIB_dbopen@ @LIBS@"
++    echo " -lkrb5 -lasn1 @LIB_des@ -lroken -lcom_err @LIB_crypt@ @LIB_dbopen@ @LIBS@"
+ fi
+ if test "$do_cflags" = "yes"; then
+     echo "-I${includedir}"
+
+Gabor
+
+-- 
+Gabor Gombas                                       Eotvos Lorand University
+E-mail: gombasg@inf.elte.hu                        Hungary
+
+
--- heimdal-0.6.3.orig/debian/patches-0.3d/012_maildir
+++ heimdal-0.6.3/debian/patches-0.3d/012_maildir
@@ -0,0 +1,40 @@
+Index: heimdal-0.3d/appl/popper/pop_pass.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/popper/pop_pass.c,v
+retrieving revision 1.1.1.3
+retrieving revision 1.5
+diff -c -r1.1.1.3 -r1.5
+*** heimdal-0.3d/appl/popper/pop_pass.c 2000/05/19 05:23:42 1.1.1.3
+--- heimdal-0.3d/appl/popper/pop_pass.c	2000/05/19 05:33:06	1.5
+***************
+*** 197,203 ****
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+!     snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
+--- 197,218 ----
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+! 
+!     /* Try ~/Maildir */
+!     if (pw->pw_dir != NULL)
+! 	{
+!         snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Maildir");
+! 	}
+!     if(pw->pw_dir != NULL && stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try ~/Mailbox */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Mailbox");
+! 	}
+!     if(pw->pw_dir == NULL || stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try /var/spool/mail/userid */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+! 	}
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
--- heimdal-0.6.3.orig/debian/patches-0.3d/013_cache
+++ heimdal-0.6.3/debian/patches-0.3d/013_cache
@@ -0,0 +1,63 @@
+--- heimdal-0.3c/lib/krb5/cache.c.orig-heimdal	Tue Nov 14 18:41:58 2000
++++ heimdal-0.3c/lib/krb5/cache.c	Tue Nov 14 19:02:07 2000
+@@ -89,11 +89,24 @@
+ {
+     krb5_error_code ret;
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc(sizeof(*p));
+     if(p == NULL)
+ 	return KRB5_CC_NOMEM;
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL)
++        return KRB5_CC_NOMEM;
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL)
++    {
++        free(q);
++        return KRB5_CC_NOMEM;
++    }
++    
++    p->ops = q;
+     *id = p;
+     ret = p->ops->resolve(context, id, residual);
+     if(ret)
+@@ -141,11 +154,24 @@
+ 		krb5_ccache *id)
+ {
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc (sizeof(*p));
+     if (p == NULL)
+ 	return KRB5_CC_NOMEM;
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL)
++        return KRB5_CC_NOMEM;
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL)
++    {
++        free(q);
++        return KRB5_CC_NOMEM;
++    }
++    
++    p->ops = q;
+     *id = p;
+     return p->ops->gen_new(context, id);
+ }
+@@ -248,6 +274,8 @@
+ {
+     krb5_error_code ret;
+     ret = id->ops->close(context, id);
++    free(id->ops->prefix);
++    free((krb5_cc_ops *)id->ops);
+     free(id);
+     return ret;
+ }
--- heimdal-0.6.3.orig/debian/patches-0.3d/016_openldap
+++ heimdal-0.6.3/debian/patches-0.3d/016_openldap
@@ -0,0 +1,77 @@
+From nobody Wed Jan 31 09:23:34 2001
+X-From-Line: maildir Wed Jan 31 01:48:43 2001
+Return-Path: <heimdal-discuss-owner@sics.se>
+Delivered-To: bam@snoopy.apana.org.au
+Received: from color.sics.se (color.sics.se [193.10.66.199])
+	by snoopy.apana.org.au (Postfix) with ESMTP id 25073349DF
+	for <bam@snoopy.apana.org.au>; Wed, 31 Jan 2001 01:48:08 +1100 (EST)
+Received: (from majordom@localhost)
+	by color.sics.se (8.9.3/8.9.3) id PAA04832
+        for heimdal-discuss-outgoing; Tue, 30 Jan 2001 15:13:19 +0100 (MET)
+	env-from (owner-heimdal-discuss@sics.se)
+Received: from gw.nectar.com (nectar@gw.nectar.com [208.42.49.153])
+	by color.sics.se (8.9.3/8.9.3) with ESMTP id PAA04818
+        for <heimdal-discuss@sics.se>; Tue, 30 Jan 2001 15:13:17 +0100 (MET)
+	env-from (nectar@nectar.com)
+Received: by gw.nectar.com (Postfix, from userid 1001)
+	id A4E4B18D06; Tue, 30 Jan 2001 08:13:05 -0600 (CST)
+Date: Tue, 30 Jan 2001 08:13:05 -0600
+From: "Jacques A. Vidrine" <n@nectar.com>
+To: Brian May <bam@snoopy.apana.org.au>
+Cc: heimdal-discuss@sics.se
+Subject: Re: openldap support
+X-Gnus-Mail-Source: maildir:~/Maildir/new
+Gnus-Warning: This is a duplicate of message <20010130081041.B43043@spawn.nectar.com>
+Message-ID: <20010130081041.B43043@spawn.nectar.com>
+Mail-Followup-To: "Jacques A. Vidrine" <n@nectar.com>,
+	Brian May <bam@snoopy.apana.org.au>, heimdal-discuss@sics.se
+References: <84elxlmw0e.fsf@snoopy.apana.org.au>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+User-Agent: Mutt/1.2.5i
+In-Reply-To: <84elxlmw0e.fsf@snoopy.apana.org.au>; from bam@snoopy.apana.org.au on Tue, Jan 30, 2001 at 04:47:29PM +1100
+X-Url: http://www.nectar.com/
+Sender: owner-heimdal-discuss@sics.se
+Precedence: bulk
+Lines: 38
+Xref: snoopy.apana.org.au heimdal.discuss:273
+
+On Tue, Jan 30, 2001 at 04:47:29PM +1100, Brian May wrote:
+> Hello,
+> 
+> I got a bug report recently for my Heimdal package because
+> it unexpectedly tried to link into the openldap libraries.
+> 
+> I was wondering what this LDAP support does, and if I should
+> enable or disable it in the Debian version.
+> 
+> Comments?
+
+It allows you to store the KDC database in LDAP rather than
+Berkeley db files. 
+
+In the FreeBSD ports system, we build it conditionally based on
+a WITH_LDAP make variable.  Also, there is a small patch to make
+it actually work, included below.
+
+
+--- heimdal-0.3d-old/lib/hdb/hdb-ldap.c.orig	Wed Nov  8 14:42:11 2000
++++ heimdal-0.3d/lib/hdb/hdb-ldap.c	Wed Nov  8 15:39:50 2000
+@@ -583,8 +583,8 @@
+     rc = 1;
+     (void) ldap_set_option((LDAP *) db->db, LDAP_OPT_SIZELIMIT, (void *) &rc);
+ 
+-    rc = ldap_search_s((LDAP *) db->db, db->name,
+-		       LDAP_SCOPE_ONELEVEL, filter, NULL, 0, msg);
++    rc = ldap_search_s((LDAP *) db->db, db->name, LDAP_SCOPE_ONELEVEL, filter,
++	krb5kdcentry_attrs, 0, msg);
+     if (rc != LDAP_SUCCESS) {
+ 	ret = HDB_ERR_NOENTRY;
+ 	goto out;
+
+-- 
+Jacques Vidrine / n@nectar.com / jvidrine@verio.net / nectar@FreeBSD.org
+
+
+
--- heimdal-0.6.3.orig/debian/patches-0.3d/015_ftp
+++ heimdal-0.6.3/debian/patches-0.3d/015_ftp
@@ -0,0 +1,25 @@
+diff -ruN heimdal-0.3d-old/appl/ftp/ftp/cmds.c heimdal-0.3d/appl/ftp/ftp/cmds.c
+--- heimdal-0.3d-old/appl/ftp/ftp/cmds.c	Tue Jul 18 20:00:31 2000
++++ heimdal-0.3d/appl/ftp/ftp/cmds.c	Wed Jan 10 13:29:04 2001
+@@ -81,7 +81,7 @@
+ setpeer(int argc, char **argv)
+ {
+ 	char *host;
+-	short port;
++	unsigned short port;
+ 	struct servent *sp;
+ 
+ 	if (connected) {
+@@ -103,12 +103,6 @@
+ 	port = sp->s_port;
+ 	if (argc > 2) {
+ 		port = atoi(argv[2]);
+-		if (port <= 0) {
+-			printf("%s: bad port number-- %s\n", argv[1], argv[2]);
+-			printf ("usage: %s host-name [port]\n", argv[0]);
+-			code = -1;
+-			return;
+-		}
+ 		port = htons(port);
+ 	}
+ 	host = hookup(argv[1], port);
--- heimdal-0.6.3.orig/debian/patches-0.3d/020_missingconf
+++ heimdal-0.6.3/debian/patches-0.3d/020_missingconf
@@ -0,0 +1,45 @@
+Index: heimdal-0.3d/kdc.conf
+===================================================================
+RCS file: kdc.conf
+diff -N kdc.conf
+*** /dev/null	Tue Nov 14 18:36:24 2000
+--- heimdal-0.3d/kdc.conf	Fri Nov 17 11:25:12 2000
+***************
+*** 0 ****
+--- 1,22 ----
++ [kdc]
++ #key-file = /var/lib/heimdal-kdc/key-file
++ logging = FILE:/var/log/heimdal-kdc.log
++ 
++ [kdcdefaults]
++ kdc_ports = 88,750
++ 
++ [realms]
++ REALM.ORG = {
++ # everything here needs checking. This might be MIT syntax, not Heimdal's
++ # syntax. At least, everything here should be defaults (or not even used).
++   database_name = /var/lib/heimdal-kdc/heimdal
++   admin_keytab = /var/lib/heimdal-kdc/kadmind.keytab
++   acl_file = /var/lib/heimdal-kdc/kadmind.acl
++   dict_file = /var/lib/heimdal-kdc/kadmind.dict
++   key_stash_file = /var/lib/heimdal-kdc/m-key
++   kadmind_port = 749
++   max_life = 10h 0m 0s
++   max_renewable_life = 7d 0h 0m 0s
++ #  master_key_type = des-cbc-crc
++ #  supported_enctypes = des-cbc-crc:normal des-cbc-crc:v4
++ }
+Index: heimdal-0.3d/logrotate
+===================================================================
+RCS file: logrotate
+diff -N logrotate
+*** /dev/null	Tue Nov 14 18:36:24 2000
+--- heimdal-0.3d/logrotate	Fri Nov 17 11:25:12 2000
+***************
+*** 0 ****
+--- 1,5 ----
++ /var/log/heimdal-kdc.log {
++ 	rotate 5
++ 	weekly
++ 	compress
++ }
--- heimdal-0.6.3.orig/debian/patches-0.3d/021_debian
+++ heimdal-0.6.3/debian/patches-0.3d/021_debian
@@ -0,0 +1,153 @@
+Index: heimdal-0.3d/setconfig
+===================================================================
+RCS file: setconfig
+diff -N setconfig
+*** /dev/null	Tue Nov 14 18:36:24 2000
+--- heimdal-0.3d/setconfig	Fri Nov 17 11:25:12 2000
+***************
+*** 0 ****
+--- 1,94 ----
++ #!/usr/bin/perl -w
++ use strict;
++ use Getopt::Long;
++ 
++ my $section;
++ my $file;
++ 
++ sub set {
++     my $setting = shift;
++     my $oldvalue = shift;
++     my $newvalue = shift;
++     
++     if (defined($newvalue))
++     {
++ 	print OUT "$setting=$newvalue\n"
++ 	     or die "Cannot write to $file.new: $!";
++     }
++ }
++ 
++ sub doit {
++     my $setting;
++     my $value;
++     ($setting,$value) = split("=",shift);
++ 
++     die "No filename given\n" if (!defined($file));
++     die "No section given\n" if (!defined($section));
++ 
++     open(IN,"<$file") or die "Cannot open $file for reading: $!\n";
++     open(OUT,">$file.new") or die "Cannot open $file.new for writing: $!\n";
++ 
++     my $insection = "none";
++     my $done = 0;
++     while (<IN>)
++     {
++ 	my $output = 1;
++ 	if (/^\s*\[([^\]]+)\]\s*$/)
++ 	{
++ 	    if (!$done and $section eq $insection)
++ 	    {
++ 	    	set($setting,undef,$value);
++ 	    	$done = 1;
++ 	    }
++ 	    $insection = $1;
++ 	}
++ 	elsif (/^\s*([\w\.]+)\s*=\s*\{\s*$/)
++ 	{
++ 		$insection = $insection . "::" . $1;
++ 	    	if ($section eq $insection and $setting eq "")
++ 		{
++ 	    		print(OUT "$value = {\n")
++ 				or die "Cannot write to $file.new: $!";
++ 			$done = 1;
++ 			$output = 0;
++ 		}
++ 	}
++ 	elsif (/^\s*\}\s*$/)
++ 	{
++ 		$insection =~ s/::[^:]+//;
++ 	}
++ 	elsif (/^\s*([\w\.]+)\s*=\s*(.*)\s*$/)
++ 	{
++ 	#print "$insection $1=$2\n";
++ 	    if ($section eq $insection and
++ 	    	$setting ne "" and
++ 	    	$setting eq $1)
++ 	    {
++ 		set($setting,$2,$value);
++ 		$output = 0;
++ 		$done = 1;
++ 	    }
++ 	}
++ 	if ($output)
++ 	{
++ 	    print(OUT $_) or die "Cannot write to $file.new: $!";
++ 	}
++     }
++ 	    
++     if (!$done)
++     {
++ 	if ($section ne $insection)
++ 	{
++ 		die "Section $section doesn't exist\n";
++ 	}
++     	set($setting,undef,$value);
++     	$done = 1;
++     }
++ 
++     close(OUT) or die "Cannot close $file.new: $!";
++     close(IN) or die "Cannot close $file: $!";
++     rename("$file.new",$file) or die "Cannot remame $file.new to $file";
++ }
++ 
++ GetOptions("file=s",\$file,"section=s",\$section,"<>",\&doit)
++ 	|| die "Cannot parse command line\n";
+Index: heimdal-0.3d/appl/telnet/telnetd/telnetd.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/telnetd/telnetd.h,v
+retrieving revision 1.1.1.2
+retrieving revision 1.2
+diff -c -r1.1.1.2 -r1.2
+*** heimdal-0.3d/appl/telnet/telnetd/telnetd.h 1999/07/24 08:24:26 1.1.1.2
+--- appl/telnet/telnetd/telnetd.h	2000/01/06 09:22:48	1.2
+***************
+*** 193,199 ****
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	BINDIR "/login"
+  
+  /* fallbacks */
+  
+--- 193,199 ----
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	LIBEXECDIR "/login"
+  
+  /* fallbacks */
+  
+Index: heimdal-0.3d/lib/hdb/hdb.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/lib/hdb/hdb.h,v
+retrieving revision 1.1.1.4
+retrieving revision 1.3
+diff -c -r1.1.1.4 -r1.3
+*** heimdal-0.3d/lib/hdb/hdb.h 2000/07/31 03:16:43 1.1.1.4
+--- heimdal-0.3d/lib/hdb/hdb.h	2000/07/31 03:22:57	1.3
+***************
+*** 78,84 ****
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/heimdal"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
+--- 78,84 ----
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/lib/heimdal-kdc"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
--- heimdal-0.6.3.orig/debian/patches-0.3d/030_autotools
+++ heimdal-0.6.3/debian/patches-0.3d/030_autotools
@@ -0,0 +1,20904 @@
+diff -ruN heimdal-0.3d-old/Makefile.in heimdal-0.3d/Makefile.in
+--- heimdal-0.3d-old/Makefile.in	Mon Dec 11 14:19:43 2000
++++ heimdal-0.3d/Makefile.in	Tue Jan  9 10:36:40 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -233,16 +243,17 @@
+ 		cf/find-if-not-broken.m4 cf/grok-type.m4 \
+ 		cf/have-pragma-weak.m4 cf/have-struct-field.m4 \
+ 		cf/have-type.m4 cf/have-types.m4 cf/krb-bigendian.m4 \
+-		cf/krb-find-db.m4 cf/krb-func-getcwd-broken.m4 \
+-		cf/krb-func-getlogin.m4 cf/krb-ipv6.m4 cf/krb-irix.m4 \
+-		cf/krb-prog-ln-s.m4 cf/krb-prog-ranlib.m4 \
+-		cf/krb-prog-yacc.m4 cf/krb-readline.m4 \
+-		cf/krb-struct-spwd.m4 cf/krb-struct-winsize.m4 \
+-		cf/krb-sys-aix.m4 cf/krb-sys-nextstep.m4 \
+-		cf/krb-version.m4 cf/mips-abi.m4 cf/misc.m4 \
+-		cf/need-proto.m4 cf/osfc2.m4 cf/proto-compat.m4 \
+-		cf/retsigtype.m4 cf/roken-frag.m4 cf/roken.m4 \
+-		cf/shared-libs.m4 cf/test-package.m4 cf/wflags.m4
++		cf/krb-com_err.m4 cf/krb-find-db.m4 \
++		cf/krb-func-getcwd-broken.m4 cf/krb-func-getlogin.m4 \
++		cf/krb-ipv6.m4 cf/krb-irix.m4 cf/krb-prog-ln-s.m4 \
++		cf/krb-prog-ranlib.m4 cf/krb-prog-yacc.m4 \
++		cf/krb-readline.m4 cf/krb-ss.m4 cf/krb-struct-spwd.m4 \
++		cf/krb-struct-winsize.m4 cf/krb-sys-aix.m4 \
++		cf/krb-sys-nextstep.m4 cf/krb-version.m4 cf/mips-abi.m4 \
++		cf/misc.m4 cf/need-proto.m4 cf/osfc2.m4 \
++		cf/proto-compat.m4 cf/retsigtype.m4 cf/roken-frag.m4 \
++		cf/roken.m4 cf/shared-libs.m4 cf/test-package.m4 \
++		cf/wflags.m4
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+@@ -283,10 +294,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -365,6 +377,7 @@
+ 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ 	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
++	  && chmod -R u+w .. \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+ 	  && rm -f $(distdir).tar.gz \
+diff -ruN heimdal-0.3d-old/aclocal.m4 heimdal-0.3d/aclocal.m4
+--- heimdal-0.3d-old/aclocal.m4	Mon Dec 11 14:19:40 2000
++++ heimdal-0.3d/aclocal.m4	Tue Jan  9 10:36:04 2001
+@@ -1,14 +1,15 @@
+-dnl ./aclocal.m4 generated automatically by aclocal 1.4a
++# aclocal.m4 generated automatically by aclocal 1.4a
+ 
+-dnl Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl This program is distributed in the hope that it will be useful,
+-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-dnl PARTICULAR PURPOSE.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
++# Free Software Foundation, Inc.
++# This file 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
+ 
+ dnl $Id: acinclude.m4,v 1.15 1998/05/23 14:54:53 joda Exp $
+ dnl
+@@ -49,32 +50,40 @@
+ ])])
+ # Like AC_CONFIG_HEADER, but automatically create stamp file.
+ 
+-AC_DEFUN(AM_CONFIG_HEADER,
+-[AC_PREREQ([2.12])
+-AC_CONFIG_HEADER([$1])
+-dnl When config.status generates a header, we must update the stamp-h file.
+-dnl This file resides in the same directory as the config header
+-dnl that is generated.  We must strip everything past the first ":",
+-dnl and everything past the last "/".
+-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+-<<am_indx=1
+-for am_file in <<$1>>; do
+-  case " <<$>>CONFIG_HEADERS " in
+-  *" <<$>>am_file "*<<)>>
+-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+-    ;;
+-  esac
+-  am_indx=`expr "<<$>>am_indx" + 1`
+-done<<>>dnl>>)
+-changequote([,]))])
++# serial 3
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  We must strip everything past the first ":",
++# and everything past the last "/".
++
++AC_PREREQ([2.12])
++
++AC_DEFUN([AM_CONFIG_HEADER],
++[AC_CONFIG_HEADER([$1])
++  AC_OUTPUT_COMMANDS(
++   ifelse(patsubst([$1], [[^ ]], []),
++	  [],
++	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
++	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
++  [am_indx=1
++  for am_file in $1; do
++    case " $CONFIG_HEADERS " in
++    *" $am_file "*)
++      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
++      ;;
++    esac
++    am_indx=\`expr \$am_indx + 1\`
++  done])
++])
+ 
+ # Do all the work for Automake.  This macro actually does too much --
+ # some checks are only needed if your package does certain things.
+ # But this isn't really a big deal.
+ 
+-# serial 2
++# serial 3
++
++AC_PREREQ([2.13])
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+@@ -92,12 +101,11 @@
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
+ # ----------------------------------------------
+-AC_DEFUN(AM_INIT_AUTOMAKE,
++AC_DEFUN([AM_INIT_AUTOMAKE],
+ [dnl We require 2.13 because we rely on SHELL being computed by configure.
+-AC_PREREQ([2.13])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ # test to see if srcdir already configured
+-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
++if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+@@ -121,8 +129,8 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG(AMTAR, tar)
+ AM_MISSING_INSTALL_SH
+-dnl We need awk for the "check" target.  The system "awk" is bad on
+-dnl some platforms.
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+@@ -141,7 +149,7 @@
+ # Check to make sure that the build environment is sane.
+ #
+ 
+-AC_DEFUN(AM_SANITY_CHECK,
++AC_DEFUN([AM_SANITY_CHECK],
+ [AC_MSG_CHECKING([whether build environment is sane])
+ # Just in case
+ sleep 1
+@@ -180,15 +188,15 @@
+ rm -f conftest*
+ AC_MSG_RESULT(yes)])
+ 
+-dnl AM_MISSING_PROG(NAME, PROGRAM)
+-AC_DEFUN(AM_MISSING_PROG, [
++# AM_MISSING_PROG(NAME, PROGRAM)
++AC_DEFUN([AM_MISSING_PROG], [
+ AC_REQUIRE([AM_MISSING_HAS_RUN])
+ $1=${$1-"${am_missing_run}$2"}
+ AC_SUBST($1)])
+ 
+-dnl Like AM_MISSING_PROG, but only looks for install-sh.
+-dnl AM_MISSING_INSTALL_SH()
+-AC_DEFUN(AM_MISSING_INSTALL_SH, [
++# Like AM_MISSING_PROG, but only looks for install-sh.
++# AM_MISSING_INSTALL_SH()
++AC_DEFUN([AM_MISSING_INSTALL_SH], [
+ AC_REQUIRE([AM_MISSING_HAS_RUN])
+ if test -z "$install_sh"; then
+    install_sh="$ac_aux_dir/install-sh"
+@@ -200,13 +208,13 @@
+ fi
+ AC_SUBST(install_sh)])
+ 
+-dnl AM_MISSING_HAS_RUN.
+-dnl Define MISSING if not defined so far and test if it supports --run.
+-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
++# AM_MISSING_HAS_RUN.
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN], [
+ test x"${MISSING+set}" = xset || \
+-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+-dnl Use eval to expand $SHELL
++  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
++# Use eval to expand $SHELL
+ if eval "$MISSING --run :"; then
+   am_missing_run="$MISSING --run "
+ else
+@@ -216,14 +224,14 @@
+ fi
+ ])
+ 
+-dnl See how the compiler implements dependency checking.
+-dnl Usage:
+-dnl AM_DEPENDENCIES(NAME)
+-dnl NAME is "CC", "CXX" or "OBJC".
++# See how the compiler implements dependency checking.
++# Usage:
++# AM_DEPENDENCIES(NAME)
++# NAME is "CC", "CXX" or "OBJC".
+ 
+-dnl We try a few techniques and use that to set a single cache variable.
++# We try a few techniques and use that to set a single cache variable.
+ 
+-AC_DEFUN(AM_DEPENDENCIES,[
++AC_DEFUN([AM_DEPENDENCIES],[
+ AC_REQUIRE([AM_SET_DEPDIR])
+ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
+ ifelse([$1],CC,[
+@@ -259,10 +267,13 @@
+       ;;
+     none) break ;;
+     esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
+     if depmode="$depmode" \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
++       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
+        grep conftest.h conftest.Po > /dev/null 2>&1; then
+       am_cv_[$1]_dependencies_compiler_type="$depmode"
+       break
+@@ -279,10 +290,10 @@
+ AC_SUBST([$1]DEPMODE)
+ ])
+ 
+-dnl Choose a directory name for dependency files.
+-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in AM_DEPENDENCIES
+ 
+-AC_DEFUN(AM_SET_DEPDIR,[
++AC_DEFUN([AM_SET_DEPDIR],[
+ if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+   DEPDIR=.deps
+ else
+@@ -291,7 +302,7 @@
+ AC_SUBST(DEPDIR)
+ ])
+ 
+-AC_DEFUN(AM_DEP_TRACK,[
++AC_DEFUN([AM_DEP_TRACK],[
+ AC_ARG_ENABLE(dependency-tracking,
+ [  --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors])
+@@ -316,16 +327,16 @@
+ popdef([subst])
+ ])
+ 
+-dnl Generate code to set up dependency tracking.
+-dnl This macro should only be invoked once -- use via AC_REQUIRE.
+-dnl Usage:
+-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
++# Generate code to set up dependency tracking.
++# This macro should only be invoked once -- use via AC_REQUIRE.
++# Usage:
++# AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+-dnl
+-dnl This code is only required when automatic dependency tracking
+-dnl is enabled.  FIXME.  This creates each `.P' file that we will
+-dnl need in order to bootstrap the dependency handling code.
+-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
+ AC_OUTPUT_COMMANDS([
+ test x"$AMDEP" != x"" ||
+ for mf in $CONFIG_FILES; do
+@@ -368,9 +379,9 @@
+ ac_aux_dir="$ac_aux_dir"])])
+ 
+ 
+-dnl AM_PROG_LEX
+-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+-AC_DEFUN(AM_PROG_LEX,
++# AM_PROG_LEX
++# Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
++AC_DEFUN([AM_PROG_LEX],
+ [AC_REQUIRE([AM_MISSING_HAS_RUN])
+ AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
+ AC_PROG_LEX
+@@ -526,23 +537,20 @@
+ 
+ 
+ 
+-# serial 44 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])])
+-AC_DEFUN(_AC_PROG_LIBTOOL,
++# serial 40 AC_PROG_LIBTOOL
++AC_DEFUN(AC_PROG_LIBTOOL,
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+ 
+ # Save cache, so that ltconfig can load it
+ AC_CACHE_SAVE
+ 
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+ || AC_MSG_ERROR([libtool configure failed])
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -567,28 +575,18 @@
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
+-# Only perform the check for file, if the check method requires it
+-case "$deplibs_check_method" in
+-file_magic*)
+-  if test "$file_magic_cmd" = '${MAGIC}'; then
+-    AC_PATH_MAGIC
+-  fi
+-  ;;
++case "$target" in
++NONE) lt_target="$host" ;;
++*) lt_target="$target" ;;
+ esac
+ 
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
+-
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -605,15 +603,9 @@
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+ 
+-AC_ARG_WITH(pic,
+-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+-     pic_mode="$withval", pic_mode=default)
+-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
+-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+-
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+-case "$host" in
++case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+@@ -638,10 +630,7 @@
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+   AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_SAVE
+-     AC_LANG_C
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_RESTORE])
++    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+     CFLAGS="$SAVE_CFLAGS"
+@@ -653,31 +642,8 @@
+   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+   AC_CHECK_TOOL(AS, as, false)
+   AC_CHECK_TOOL(OBJDUMP, objdump, false)
+-
+-  # recent cygwin and mingw systems supply a stub DllMain which the user
+-  # can override, but on older systems we have to supply one
+-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
+-    [AC_TRY_LINK([],
+-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+-      DllMain (0, 0, 0);],
+-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
+-
+-  case "$host/$CC" in
+-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+-    # old mingw systems require "-dll" to link a DLL, while more recent ones
+-    # require "-mdll"
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -mdll"
+-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
+-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
+-    CFLAGS="$SAVE_CFLAGS" ;;
+-  *-*-cygwin*)
+-    # cygwin systems need to pass --dll to the linker, and not link
+-    # crt.o which will require a WinMain@16 definition.
+-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
+-  esac
+   ;;
+-  ])
++])
+ esac
+ ])
+ 
+@@ -783,94 +749,10 @@
+ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+ ])
+ 
+-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
++# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+ AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_FAST_INSTALL(no)])
+ 
+-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
+-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
+-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
+-#   `both'.
+-AC_DEFUN(AC_LIBTOOL_PICMODE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)])
+-
+-
+-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+-AC_DEFUN(AC_PATH_TOOL_PREFIX,
+-[AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC,
+-[case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac])
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  AC_MSG_RESULT($MAGIC)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-])
+-
+-
+-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+-AC_DEFUN(AC_PATH_MAGIC,
+-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+-if test -z "$lt_cv_path_MAGIC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
+-  else
+-    MAGIC=:
+-  fi
+-fi
+-])
+-
+-
+ # AC_PROG_LD - find the path to the GNU or non-GNU linker
+ AC_DEFUN(AC_PROG_LD,
+ [AC_ARG_WITH(gnu-ld,
+@@ -883,13 +765,7 @@
+ if test "$ac_cv_prog_gcc" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   AC_MSG_CHECKING([for ld used by GCC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
++  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+   case "$ac_prog" in
+     # Accept absolute paths.
+ changequote(,)dnl
+@@ -956,170 +832,8 @@
+ else
+   ac_cv_prog_gnu_ld=no
+ fi])
+-with_gnu_ld=$ac_cv_prog_gnu_ld
+ ])
+ 
+-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN(AC_PROG_LD_RELOAD_FLAG,
+-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
+-[lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
+-])
+-
+-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN(AC_DEPLIBS_CHECK_METHOD,
+-[AC_CACHE_CHECK([how to recognise dependant libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='${MAGIC}'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [regex]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
+-
+-case "$host_os" in
+-aix4*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-bsdi4*)
+-  changequote(,)dnl
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-  changequote([, ])dnl
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+-
+-cygwin* | mingw*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+-  ;;
+-
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case "$host_cpu" in
+-    i*86 )
+-      changequote(,)dnl
+-      lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
+-      changequote([, ])dnl
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20*)
+-  # TODO:  Does this work for hpux-11 too?
+-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
+-
+-irix5* | irix6*)
+-  case "$host_os" in
+-  irix5*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case "$LD" in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-    changequote([, ])dnl
+-    ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux-gnu*)
+-  case "$host_cpu" in
+-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-    changequote([, ])dnl
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  ;;
+-
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+-  else
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-    changequote([, ])dnl
+-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-  fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case "$host_vendor" in
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  motorola)
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-    changequote([, ])dnl
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-])
+-
+-
+ # AC_PROG_NM - find the path to a BSD-compatible name lister
+ AC_DEFUN(AC_PROG_NM,
+ [AC_MSG_CHECKING([for BSD-compatible nm])
+@@ -1131,19 +845,18 @@
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+     test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -B"
++      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -B"
+ 	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -p"
++      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -p"
+ 	break
+       else
+-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
++	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ 	continue # so that we can try to find one that supports BSD flags
+       fi
+     fi
+@@ -1159,7 +872,7 @@
+ AC_DEFUN(AC_CHECK_LIBM,
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+-case "$host" in
++case "$lt_target" in
+ *-*-beos* | *-*-cygwin*)
+   # These system don't have libm
+   ;;
+@@ -2022,7 +1735,7 @@
+ 
+ # Define a conditional.
+ 
+-AC_DEFUN(AM_CONDITIONAL,
++AC_DEFUN([AM_CONDITIONAL],
+ [AC_SUBST($1_TRUE)
+ AC_SUBST($1_FALSE)
+ if $2; then
+@@ -2386,49 +2099,6 @@
+ #endif])
+ ])
+ 
+-dnl $Id: krb-func-getcwd-broken.m4,v 1.2 1999/03/01 13:03:32 joda Exp $
+-dnl
+-dnl
+-dnl test for broken getcwd in (SunOS braindamage)
+-dnl
+-
+-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
+-if test "$ac_cv_func_getcwd" = yes; then
+-AC_MSG_CHECKING(if getcwd is broken)
+-AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
+-ac_cv_func_getcwd_broken=no
+-
+-AC_TRY_RUN([
+-#include <errno.h>
+-char *getcwd(char*, int);
+-
+-void *popen(char *cmd, char *mode)
+-{
+-	errno = ENOTTY;
+-	return 0;
+-}
+-
+-int main()
+-{
+-	char *ret;
+-	ret = getcwd(0, 1024);
+-	if(ret == 0 && errno == ENOTTY)
+-		return 0;
+-	return 1;
+-}
+-], ac_cv_func_getcwd_broken=yes,:,:)
+-])
+-if test "$ac_cv_func_getcwd_broken" = yes; then
+-	AC_DEFINE(BROKEN_GETCWD, 1, [Define if getcwd is broken (like in SunOS 4).])dnl
+-	LIBOBJS="$LIBOBJS getcwd.o"
+-	AC_SUBST(LIBOBJS)dnl
+-	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
+-else
+-	AC_MSG_RESULT([seems ok])
+-fi
+-fi
+-])
+-
+ dnl $Id: proto-compat.m4,v 1.3 1999/03/01 13:03:48 joda Exp $
+ dnl
+ dnl
+@@ -2574,7 +2244,7 @@
+ dnl
+ dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+ 
+-AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
++AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
+ 
+ AC_DEFUN(AC_TEST_PACKAGE_NEW,[
+ AC_ARG_WITH($1,
+@@ -2611,7 +2281,7 @@
+ header_dirs=
+ lib_dirs=
+ d='$5'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -2644,6 +2314,7 @@
+ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+ 	$1_includedir="$ires"
+ 	$1_libdir="$lres"
++	DIR_$1=
+ 	INCLUDE_$1="-I$$1_includedir"
+ 	LIB_$1="-L$$1_libdir $3"
+ 	ifval([$6],
+@@ -2652,6 +2323,7 @@
+ 	with_$1=yes
+ 	AC_MSG_RESULT([headers $ires, libraries $lres])
+ else
++	DIR_$1="$1"
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	with_$1=no
+@@ -2660,6 +2332,7 @@
+ dnl ifval([$6],
+ dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
+ dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+@@ -3062,19 +2735,95 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init"
+ else
++	DIR_readline="editline"
+ 	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ AC_DEFINE(HAVE_READLINE, 1, 
+ 	[Define if you have a readline compatible library.])dnl
+ 
+ ])
++
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_COM_ERR,[
++dnl com_err
++
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++AC_DEFINE(HAVE_COM_ERR, 1, 
++	[Define if you have a com_err compatible library.])dnl
++
++])
++AC_SUBST(COMPILE_ET)
++
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_SS,[
++dnl com_err
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++AC_DEFINE(HAVE_SS, 1, 
++	[Define if you have a ss compatible library.])dnl
++
++])
++AC_SUBST(LIB_sl)
++
+ dnl $Id: auth-modules.m4,v 1.1 1999/03/21 13:48:00 joda Exp $
+ dnl
+ dnl Figure what authentication modules should be built
+diff -ruN heimdal-0.3d-old/admin/Makefile.in heimdal-0.3d/admin/Makefile.in
+--- heimdal-0.3d-old/admin/Makefile.in	Mon Dec 11 14:19:58 2000
++++ heimdal-0.3d/admin/Makefile.in	Tue Jan  9 10:36:48 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -125,13 +128,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline)
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline) $(INCLUDE_ss)
+ 
+ AM_CFLAGS =  $(WFLAGS)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -207,7 +217,7 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+ 
+@@ -232,8 +242,7 @@
+ ktutil_OBJECTS =  $(am_ktutil_OBJECTS)
+ ktutil_LDADD = $(LDADD)
+ ktutil_DEPENDENCIES =  $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+-$(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/asn1/libasn1.la \
+-$(top_builddir)/lib/sl/libsl.la
++$(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/asn1/libasn1.la
+ ktutil_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3d-old/appl/Makefile.in heimdal-0.3d/appl/Makefile.in
+--- heimdal-0.3d-old/appl/Makefile.in	Mon Dec 11 14:19:59 2000
++++ heimdal-0.3d/appl/Makefile.in	Tue Jan  9 10:36:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -267,10 +277,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3d-old/appl/afsutil/Makefile.in heimdal-0.3d/appl/afsutil/Makefile.in
+--- heimdal-0.3d-old/appl/afsutil/Makefile.in	Mon Dec 11 14:19:59 2000
++++ heimdal-0.3d/appl/afsutil/Makefile.in	Tue Jan  9 10:36:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/dceutils/Makefile.in heimdal-0.3d/appl/dceutils/Makefile.in
+--- heimdal-0.3d-old/appl/dceutils/Makefile.in	Mon Dec 11 14:20:08 2000
++++ heimdal-0.3d/appl/dceutils/Makefile.in	Tue Jan  9 10:36:55 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -234,8 +244,7 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
+ depcomp = 
+-DIST_COMMON =  ChangeLog Makefile.am Makefile.in appl/dceutils/compile \
+-compile
++DIST_COMMON =  ChangeLog Makefile.am Makefile.in compile
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -356,7 +365,6 @@
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+ 
+ distdir: $(DISTFILES)
+-	$(mkinstalldirs) $(distdir)/appl/dceutils
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+diff -ruN heimdal-0.3d-old/appl/ftp/Makefile.in heimdal-0.3d/appl/ftp/Makefile.in
+--- heimdal-0.3d-old/appl/ftp/Makefile.in	Mon Dec 11 14:19:59 2000
++++ heimdal-0.3d/appl/ftp/Makefile.in	Tue Jan  9 10:36:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -248,10 +258,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3d-old/appl/ftp/common/Makefile.in heimdal-0.3d/appl/ftp/common/Makefile.in
+--- heimdal-0.3d-old/appl/ftp/common/Makefile.in	Mon Dec 11 14:20:00 2000
++++ heimdal-0.3d/appl/ftp/common/Makefile.in	Tue Jan  9 10:36:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/ftp/ftp/Makefile.in heimdal-0.3d/appl/ftp/ftp/Makefile.in
+--- heimdal-0.3d-old/appl/ftp/ftp/Makefile.in	Mon Dec 11 14:20:00 2000
++++ heimdal-0.3d/appl/ftp/ftp/Makefile.in	Tue Jan  9 10:36:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/ftp/ftpd/Makefile.in heimdal-0.3d/appl/ftp/ftpd/Makefile.in
+--- heimdal-0.3d-old/appl/ftp/ftpd/Makefile.in	Mon Dec 11 14:20:01 2000
++++ heimdal-0.3d/appl/ftp/ftpd/Makefile.in	Tue Jan  9 10:36:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/kf/Makefile.in heimdal-0.3d/appl/kf/Makefile.in
+--- heimdal-0.3d-old/appl/kf/Makefile.in	Mon Dec 11 14:20:08 2000
++++ heimdal-0.3d/appl/kf/Makefile.in	Tue Jan  9 10:36:55 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/kx/Makefile.in heimdal-0.3d/appl/kx/Makefile.in
+--- heimdal-0.3d-old/appl/kx/Makefile.in	Mon Dec 11 14:20:02 2000
++++ heimdal-0.3d/appl/kx/Makefile.in	Tue Jan  9 10:36:51 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+@@ -130,7 +133,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -172,6 +175,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/login/Makefile.in heimdal-0.3d/appl/login/Makefile.in
+--- heimdal-0.3d-old/appl/login/Makefile.in	Mon Dec 11 14:20:02 2000
++++ heimdal-0.3d/appl/login/Makefile.in	Tue Jan  9 10:36:51 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/otp/Makefile.in heimdal-0.3d/appl/otp/Makefile.in
+--- heimdal-0.3d-old/appl/otp/Makefile.in	Mon Dec 11 14:20:03 2000
++++ heimdal-0.3d/appl/otp/Makefile.in	Tue Jan  9 10:36:51 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/popper/Makefile.in heimdal-0.3d/appl/popper/Makefile.in
+--- heimdal-0.3d-old/appl/popper/Makefile.in	Mon Dec 11 14:20:03 2000
++++ heimdal-0.3d/appl/popper/Makefile.in	Tue Jan  9 10:36:51 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/push/Makefile.in heimdal-0.3d/appl/push/Makefile.in
+--- heimdal-0.3d-old/appl/push/Makefile.in	Mon Dec 11 14:20:04 2000
++++ heimdal-0.3d/appl/push/Makefile.in	Tue Jan  9 10:36:52 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/rsh/Makefile.in heimdal-0.3d/appl/rsh/Makefile.in
+--- heimdal-0.3d-old/appl/rsh/Makefile.in	Mon Dec 11 14:20:04 2000
++++ heimdal-0.3d/appl/rsh/Makefile.in	Tue Jan  9 10:36:52 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/su/Makefile.in heimdal-0.3d/appl/su/Makefile.in
+--- heimdal-0.3d-old/appl/su/Makefile.in	Mon Dec 11 14:20:05 2000
++++ heimdal-0.3d/appl/su/Makefile.in	Tue Jan  9 10:36:52 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/telnet/Makefile.in heimdal-0.3d/appl/telnet/Makefile.in
+--- heimdal-0.3d-old/appl/telnet/Makefile.in	Mon Dec 11 14:20:05 2000
++++ heimdal-0.3d/appl/telnet/Makefile.in	Tue Jan  9 10:36:53 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -250,10 +260,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3d-old/appl/telnet/libtelnet/Makefile.in heimdal-0.3d/appl/telnet/libtelnet/Makefile.in
+--- heimdal-0.3d-old/appl/telnet/libtelnet/Makefile.in	Mon Dec 11 14:20:06 2000
++++ heimdal-0.3d/appl/telnet/libtelnet/Makefile.in	Tue Jan  9 10:36:53 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/telnet/telnet/Makefile.in heimdal-0.3d/appl/telnet/telnet/Makefile.in
+--- heimdal-0.3d-old/appl/telnet/telnet/Makefile.in	Mon Dec 11 14:20:06 2000
++++ heimdal-0.3d/appl/telnet/telnet/Makefile.in	Tue Jan  9 10:36:53 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/telnet/telnetd/Makefile.in heimdal-0.3d/appl/telnet/telnetd/Makefile.in
+--- heimdal-0.3d-old/appl/telnet/telnetd/Makefile.in	Mon Dec 11 14:20:07 2000
++++ heimdal-0.3d/appl/telnet/telnetd/Makefile.in	Tue Jan  9 10:36:54 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/test/Makefile.in heimdal-0.3d/appl/test/Makefile.in
+--- heimdal-0.3d-old/appl/test/Makefile.in	Mon Dec 11 14:20:07 2000
++++ heimdal-0.3d/appl/test/Makefile.in	Tue Jan  9 10:36:54 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/appl/xnlock/Makefile.in heimdal-0.3d/appl/xnlock/Makefile.in
+--- heimdal-0.3d-old/appl/xnlock/Makefile.in	Mon Dec 11 14:20:05 2000
++++ heimdal-0.3d/appl/xnlock/Makefile.in	Tue Jan  9 10:36:53 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+@@ -130,7 +133,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -172,6 +175,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/configure heimdal-0.3d/configure
+--- heimdal-0.3d-old/configure	Mon Dec 11 14:21:14 2000
++++ heimdal-0.3d/configure	Tue Jan  9 10:37:04 2001
+@@ -1,12 +1,47 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.263
++# From configure.in Revision: 1.263 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.14a.
++# Generated by Autoconf 2.49b for heimdal 0.3d.
+ #
+-# Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
++# Report bugs to <heimdal-bugs@pdc.kth.se>.
++#
++# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+ # Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++
++# Support unset when possible.
++if (unset FOO) >/dev/null 2>&1; then
++  ac_unset=unset
++else
++  ac_unset=false
++fi
++
++# NLS nuisances.
++$ac_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
++$ac_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
++$ac_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
++$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
++$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
++$ac_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
++$ac_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
++$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++ac_nl='
++'
++IFS=" 	$ac_nl"
++
++# CDPATH.
++$ac_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+ 
+ #
+ # Initializations.
+@@ -445,6 +480,34 @@
+   fi
+ fi
+ srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ 
+ #
+ # Report the --help message.
+@@ -458,7 +521,7 @@
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+ To assign environment variables (e.g., CC, CFLAGS...), specify them as
+-VAR=VALUE.  See below for descriptions of useful variables.
++VAR=VALUE.  See below for descriptions of some of the useful variables.
+ 
+ Defaults for the options are specified in brackets.
+ 
+@@ -550,7 +613,6 @@
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+   --with-mips-abi=abi     ABI to use for IRIX (32, n32, or 64)
+   --with-gnu-ld           assume the C compiler uses GNU ld default=no
+-  --with-pic              try to use only PIC/non-PIC objects default=use both
+   --without-berkeley-db   if you don't want berkeley db
+   --without-ipv6	do not enable IPv6 support
+   --with-openldap=dir                use openldap in dir
+@@ -562,21 +624,29 @@
+   --with-readline=dir                use readline in dir
+   --with-readline-lib=dir            use readline libraries in dir
+   --with-readline-include=dir        use readline headers in dir
++  --with-com_err=dir                use com_err in dir
++  --with-com_err-lib=dir            use com_err libraries in dir
++  --with-com_err-include=dir        use com_err headers in dir
++  --with-ss=dir                use ss in dir
++  --with-ss-lib=dir            use ss libraries in dir
++  --with-ss-include=dir        use ss headers in dir
+   --with-hesiod=dir                use hesiod in dir
+   --with-hesiod-lib=dir            use hesiod libraries in dir
+   --with-hesiod-include=dir        use hesiod headers in dir
+   --with-x                use the X Window System
+-  --without-ipv6	do not enable IPv6 support
+ 
+-Some relevant environment variables, which you can use to override the
+-choices made by the configure script or to help it to find libraries and
+-programs with nonstandard names/locations:
++Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+               headers in a nonstandard directory <include dir>
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++Report bugs to <heimdal-bugs@pdc.kth.se>.
+ EOF
+ fi
+ 
+@@ -599,7 +669,10 @@
+     esac
+ 
+     # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_sub_srcdir/configure; then
++    if test -f $ac_sub_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_sub_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_sub_srcdir/configure; then
+       echo
+       $SHELL $ac_sub_srcdir/configure  --help=recursive
+     elif test -f $ac_sub_srcdir/configure.in; then
+@@ -615,45 +688,15 @@
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\EOF
+-configure (heimdal 0.3d) 2.14a
++configure (heimdal 0.3d) 2.49b
+ 
+-Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000
++Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+ Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ EOF
+   exit 0
+ fi
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
+-fi
+-
+-# Support unset when possible.
+-if (unset FOO) >/dev/null 2>&1; then
+-  ac_unset=unset
+-else
+-  ac_unset=false
+-fi
+-
+-# NLS nuisances.
+-$ac_unset LANG || test "${LANG+set}" != set || LANG=C && export LANG
+-$ac_unset LC_ALL || test "${LC_ALL+set}" != set || LC_ALL=C && export LC_ALL
+-$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || LC_CTYPE=C && export LC_CTYPE
+-$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || LANGUAGE=C && export LANGUAGE
+-$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || LC_MESSAGES=C && export LC_MESSAGES
+-
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-ac_nl='
+-'
+-IFS=" 	$ac_nl"
+-
+-# CDPATH.
+-$ac_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
+ 
+ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+ 
+@@ -698,7 +741,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by configure (heimdal 0.3d) 2.14a, executed with
++It was created by configure (heimdal 0.3d) 2.49b, executed with
+  > $0 $ac_configure_args
+ " >&5
+ 
+@@ -707,6 +750,7 @@
+ # AIX cpp loses on an empty file, so make sure it contains at least a newline.
+ echo >confdefs.h
+ 
++# Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -z "$CONFIG_SITE"; then
+   if test "x$prefix" != xNONE; then
+@@ -737,12 +781,42 @@
+   >$cache_file
+ fi
+ 
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_suggest_removing_cache=false
++for ac_var in `(set) 2>&1 |
++               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      echo "configure: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2
++      ac_suggest_removing_cache=: ;;
++    ,set)
++      echo "configure: WARNING: \`$ac_var' was not set in the previous run" >&2
++      ac_suggest_removing_cache=: ;;
++    ,);;
++    *)
++      if test "x$ac_old_val" != "x$ac_new_val"; then
++        echo "configure: WARNING: \`$ac_var' has changed since the previous run:" >&2
++        echo "configure: WARNING:   former value:  $ac_old_val" >&2
++        echo "configure: WARNING:   current value: $ac_new_val" >&2
++        ac_suggest_removing_cache=:
++      fi;;
++  esac
++done
++if $ac_suggest_removing_cache; then
++  echo "configure: WARNING: changes in the environment can compromise the build" >&2
++  echo "configure: WARNING: consider removing $cache_file and starting over" >&2
++fi
++
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+   *c*,-n*) ECHO_N= ECHO_C='
+@@ -753,27 +827,18 @@
+ 
+ ac_config_headers="$ac_config_headers include/config.h"
+ 
+-ac_config_commands="$ac_config_commands default-1"
++  ac_config_commands="$ac_config_commands default-1"
+ 
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-
+-case "${CC+set} $ac_configure_args" in
+- *" CC="* );;
+- "set "*) ac_configure_args="CC='$CC' $ac_configure_args";;
+-esac
+-case "${CFLAGS+set} $ac_configure_args" in
+- *" CFLAGS="* );;
+- "set "*) ac_configure_args="CFLAGS='$CFLAGS' $ac_configure_args";;
+-esac
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "configure:678: checking for $ac_word" >&5
++echo "configure:841: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -786,7 +851,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ break
+ done
+@@ -795,18 +860,19 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "configure:699: result: $CC" >&5
++  echo "configure:863: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "configure:702: result: no" >&5
++  echo "configure:866: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++fi
+ if test -z "$ac_cv_prog_CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "gcc", so it can be a program name with args.
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "configure:709: checking for $ac_word" >&5
++echo "configure:875: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -819,7 +885,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+ break
+ done
+@@ -828,23 +894,91 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "configure:730: result: $ac_ct_CC" >&5
++  echo "configure:897: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "configure:733: result: no" >&5
++  echo "configure:900: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-    CC="$ac_ct_CC"
+-  else
+-    CC=""
+-  fi
++  CC=$ac_ct_CC
+ fi
+ 
+-  if test -z "$CC"; then
+-    # Extract the first word of "cc", so it can be a program name with args.
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++echo "configure:911: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}cc"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:933: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:936: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:945: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="cc"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:967: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:970: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "configure:744: checking for $ac_word" >&5
++echo "configure:981: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -858,7 +992,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+   ac_prog_rejected=yes
+   continue
+@@ -885,19 +1019,21 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "configure:784: result: $CC" >&5
++  echo "configure:1022: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "configure:787: result: no" >&5
++  echo "configure:1025: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-    if test -z "$CC"; then
+-      for ac_prog in cl
+-do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "configure:795: checking for $ac_word" >&5
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "configure:1036: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -910,8 +1046,8 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_CC="$ac_prog"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ break
+ done
+ 
+@@ -919,25 +1055,65 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "configure:816: result: $CC" >&5
++  echo "configure:1058: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "configure:819: result: no" >&5
++  echo "configure:1061: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:1074: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="$ac_prog"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1096: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1099: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$CC" && break
++  test -n "$ac_ct_CC" && break
+ done
+ 
+-    fi
+-  fi
++  CC=$ac_ct_CC
++fi
++
++fi
+ 
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
+ 
+-echo "configure:827: checking whether the C compiler works" >&5
++echo "configure:1113: checking whether the C compiler works" >&5
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<EOF
+-#line 830 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 1116 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -947,12 +1123,13 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:839: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1128: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   # FIXME: these cross compiler hacks should be removed for autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+-  if { ac_try='./conftest'; { (eval echo configure:843: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
++  if { ac_try='./conftest$ac_exeext'; { (eval echo configure:1132: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+@@ -963,179 +1140,101 @@
+     fi
+   fi
+ fi
+-echo "configure:854: result: yes" >&5
++echo "configure:1143: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  echo "configure:859: result: no" >&5
++  echo "configure:1148: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ { echo "configure: error: C compiler cannot create executables" >&2; exit 77; }
+ fi
+-rm -f conftest*echo "configure:863: checking whether we are cross compiling" >&5
++rm -f conftest$ac_exeext conftest.$ac_ext
++echo "configure:1153: checking whether we are cross compiling" >&5
+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "configure:865: result: $cross_compiling" >&5
++echo "configure:1155: result: $cross_compiling" >&5
+ echo "${ECHO_T}$cross_compiling" >&6
+ 
+-echo "configure:867: checking whether we are using GNU C" >&5
+-echo $ECHO_N "checking whether we are using GNU C... $ECHO_C" >&6
+-if test "${ac_cv_prog_gcc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # The semicolon is to pacify NeXT's syntax-checking cpp.
+-cat >conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
+-#endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:878: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
+-else
+-  ac_cv_prog_gcc=no
+-fi
+-fi
+-echo "configure:884: result: $ac_cv_prog_gcc" >&5
+-echo "${ECHO_T}$ac_cv_prog_gcc" >&6
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-if test $ac_gnu_compiler = yes; then
+-  GCC=yes
+-else
+-  GCC=
+-fi
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS=
+-echo "configure:895: checking whether ${CC-cc} accepts -g" >&5
+-echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  echo 'void f(){}' >conftest.c
+-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+-  ac_cv_prog_cc_g=yes
+-else
+-  ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest*
+-
+-fi
+-echo "configure:908: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-echo "configure:925: checking for Cygwin environment" >&5
+-echo $ECHO_N "checking for Cygwin environment... $ECHO_C" >&6
+-if test "${ac_cv_cygwin+set}" = set; then
++echo "configure:1158: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 931 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1164 "configure"
+ #include "confdefs.h"
+-
+-int
+-main ()
+-{
+-#ifndef __CYGWIN__
+-# define __CYGWIN__ __CYGWIN32__
++#ifndef __GNUC__
++  choke me
+ #endif
+-return __CYGWIN__;
+-  ;
+-  return 0;
+-}
+-EOF
+-if { (eval echo configure:944: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  ac_cv_cygwin=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_cygwin=no
+-fi
+-rm -f conftest*
+-fi
+-echo "configure:953: result: $ac_cv_cygwin" >&5
+-echo "${ECHO_T}$ac_cv_cygwin" >&6
+-test "$ac_cv_cygwin" = yes && CYGWIN=yes
+-echo "configure:956: checking for mingw32 environment" >&5
+-echo $ECHO_N "checking for mingw32 environment... $ECHO_C" >&6
+-if test "${ac_cv_mingw32+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<EOF
+-#line 962 "configure"
+-#include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-return __MINGW32__;
++
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:972: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  ac_cv_mingw32=yes
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1179: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_compiler_gnu=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  ac_cv_mingw32=no
++  ac_compiler_gnu=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
+ fi
+-echo "configure:981: result: $ac_cv_mingw32" >&5
+-echo "${ECHO_T}$ac_cv_mingw32" >&6
+-test "$ac_cv_mingw32" = yes && MINGW32=yes
+-echo "configure:984: checking for EMX OS/2 environment" >&5
+-echo $ECHO_N "checking for EMX OS/2 environment... $ECHO_C" >&6
+-if test "${ac_cv_emxos2+set}" = set; then
++echo "configure:1190: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++echo "configure:1193: checking for object suffix" >&5
++echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 990 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1199 "configure"
+ #include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-return __EMX__;
++
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1000: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  ac_cv_emxos2=yes
++_ACEOF
++if { (eval echo configure:1210: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++  for ac_file in conftest.*; do
++  case $ac_file in
++    *.$ac_ext) ;;
++    *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
++  esac
++  done
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_emxos2=no
++  rm -f conftest.$ac_ext
++  { echo "configure: error: cannot compile" >&2; exit 1; }
+ fi
+-rm -f conftest*
+ fi
+-echo "configure:1009: result: $ac_cv_emxos2" >&5
+-echo "${ECHO_T}$ac_cv_emxos2" >&6
+-test "$ac_cv_emxos2" = yes && EMXOS2=yes
+-echo "configure:1012: checking for executable suffix" >&5
++echo "configure:1222: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$ac_cv_objext
++rm -f conftest.$ac_objext conftest.$ac_ext
++
++echo "configure:1228: checking for executable suffix" >&5
+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+ if test "${ac_cv_exeext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then
+-  ac_cv_exeext=.exe
+-else
+-  cat >conftest.$ac_ext <<EOF
+-#line 1021 "configure"
++  case "$CYGWIN $MINGW32 $EMXOS2" in
++  *yes*) ac_cv_exeext=.exe ;;
++  *)
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1237 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1145,36 +1244,42 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1030: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  for ac_file in conftest.*; do
+-     case $ac_file in
+-       *.$ac_ext | *.o | *.obj | *.xcoff) ;;
+-       *) ac_cv_exeext=`echo $ac_file | sed s/conftest//` ;;
+-     esac
+-   done
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1249: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  if test ! -f conftest; then
++    for ac_file in conftest.*; do
++       case $ac_file in
++         *.$ac_ext | *.o | *.obj | *.xcoff) ;;
++         *) ac_cv_exeext=`expr "$ac_file" : 'conftest\(.*\)'`;;
++       esac
++     done
++   fi
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   { echo "configure: error: cannot compile and link" >&2; exit 1; }
+ fi
+-rm -f conftest*
+-  test -n "$ac_cv_exeext" && ac_cv_exeext=no
+-fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++  test -n "$ac_cv_exeext" && ac_cv_exeext=no;;
++esac
+ fi
+-echo "configure:1046: result: $ac_cv_exeext" >&5
++echo "configure:1267: result: $ac_cv_exeext" >&5
+ echo "${ECHO_T}$ac_cv_exeext" >&6
+ EXEEXT=
+ test "$ac_cv_exeext" != no && EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+ 
+-echo "configure:1051: checking for object suffix" >&5
+-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "configure:1276: checking whether ${CC-cc} accepts -g" >&5
++echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 1057 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1282 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1184,114 +1289,606 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1066: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+-  for ac_file in conftest.*; do
+-    case $ac_file in
+-      *.$ac_ext) ;;
+-      *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
+-    esac
+-  done
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1294: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_g=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  { echo "configure: error: cannot compile" >&2; exit 1; }
++  ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
++fi
++echo "configure:1303: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+-echo "configure:1080: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
+-OBJEXT=$ac_cv_objext
+-ac_objext=$ac_cv_objext
+-
+ ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "configure:1090: checking how to run the C preprocessor" >&5
++echo "configure:1326: checking how to run the C preprocessor" >&5
+ echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-if test "${ac_cv_prog_CPP+set}" = set; then
++  if test "${ac_cv_prog_CPP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  cat >conftest.$ac_ext <<EOF
+-#line 1108 "configure"
++      # Double quotes because CPP needs to be expanded
++    for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp"
++    do
++      # Use a header file that comes with gcc, so configuring glibc
++# with a fresh cross-compiler works.
++# On the NeXT, cc -E runs the code through the compiler's parser,
++# not just through cpp. "Syntax error" is here to catch this case.
++cat >conftest.$ac_ext <<_ACEOF
++#line 1349 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1114: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
++Syntax error
++_ACEOF
++ac_c_preproc_warn_flag=maybe
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1356: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat >conftest.$ac_ext <<EOF
+-#line 1124 "configure"
++  ac_cpp_err=yes
++fi
++
++# Now check whether non-existent headers can be detected and how
++# Skip if ac_cpp_err is not empty - ac_cpp is broken
++if test -z "$ac_cpp_err"; then
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1370 "configure"
++#include "confdefs.h"
++#include <ac_nonexistent.h>
++_ACEOF
++  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1375: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++  if test -z "$ac_cpp_err"; then
++    # cannot detect missing includes at all
++    ac_cpp_err=yes
++  else
++    if test "x$ac_cpp_err" = xmaybe; then
++      ac_c_preproc_warn_flag=yes
++    else
++      ac_c_preproc_warn_flag=
++    fi
++    ac_cpp_err=
++  fi
++fi
++rm -f conftest*
++
++      if test -z "$ac_cpp_err"; then
++        break
++      fi
++    done
++    ac_cv_prog_CPP=$CPP
++
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  # Use a header file that comes with gcc, so configuring glibc
++# with a fresh cross-compiler works.
++# On the NeXT, cc -E runs the code through the compiler's parser,
++# not just through cpp. "Syntax error" is here to catch this case.
++cat >conftest.$ac_ext <<_ACEOF
++#line 1413 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1130: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
++Syntax error
++_ACEOF
++ac_c_preproc_warn_flag=maybe
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1420: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++# Now check whether non-existent headers can be detected and how
++# Skip if ac_cpp_err is not empty - ac_cpp is broken
++if test -z "$ac_cpp_err"; then
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1434 "configure"
++#include "confdefs.h"
++#include <ac_nonexistent.h>
++_ACEOF
++  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1439: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++  if test -z "$ac_cpp_err"; then
++    # cannot detect missing includes at all
++    ac_cpp_err=yes
++  else
++    if test "x$ac_cpp_err" = xmaybe; then
++      ac_c_preproc_warn_flag=yes
++    else
++      ac_c_preproc_warn_flag=
++    fi
++    ac_cpp_err=
++  fi
++fi
++rm -f conftest*
++
++  ac_cv_prog_CPP=$CPP
++fi
++echo "configure:1465: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++if test -n "$ac_cpp_err"; then
++  { echo "configure: error: C preprocessor \"$CPP\" fails sanity check" >&2; exit 1; }
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++echo "configure:1485: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}gcc"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1507: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1510: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo "configure:1519: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="gcc"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1541: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1544: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++echo "configure:1555: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}cc"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1577: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1580: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:1589: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="cc"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1611: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1614: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:1625: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++  ac_prog_rejected=yes
++  continue
++fi
++ac_cv_prog_CC="cc"
++break
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    set dummy "$ac_dir/$ac_word" ${1+"$@"}
++    shift
++    ac_cv_prog_CC="$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1666: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1669: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "configure:1680: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++break
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1702: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1705: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:1718: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="$ac_prog"
++break
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1740: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "configure:1743: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
++
++echo "configure:1757: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line 1760 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1772: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  # FIXME: these cross compiler hacks should be removed for autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./conftest$ac_exeext'; { (eval echo configure:1776: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++      cross_compiling=yes
++    else
++      { echo "configure: error: cannot run C compiled programs.
++To enable cross compilation, use \`--host'." >&2; exit 1; }
++    fi
++  fi
++fi
++echo "configure:1787: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  CPP="${CC-cc} -nologo -E"
+-  cat >conftest.$ac_ext <<EOF
+-#line 1140 "configure"
++  echo "configure:1792: result: no" >&5
++echo "${ECHO_T}no" >&6
++{ echo "configure: error: C compiler cannot create executables" >&2; exit 77; }
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++echo "configure:1797: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "configure:1799: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "configure:1802: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1808 "configure"
+ #include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1146: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
++#ifndef __GNUC__
++  choke me
++#endif
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1823: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_compiler_gnu=yes
+ else
+-  echo "$ac_err" >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  CPP=/lib/cpp
++  ac_compiler_gnu=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
+ fi
+-rm -f conftest*
++echo "configure:1834: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "configure:1841: checking whether ${CC-cc} accepts -g" >&5
++echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1847 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1859: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP=$CPP
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-  CPP=$ac_cv_prog_CPP
++echo "configure:1868: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
+ else
+-  ac_cv_prog_CPP=$CPP
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+-echo "configure:1167: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "configure:1169: checking for ${CC-cc} option to accept ANSI C" >&5
++echo "configure:1891: checking for ${CC-cc} option to accept ANSI C" >&5
+ echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1308,8 +1905,8 @@
+ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  cat >conftest.$ac_ext <<EOF
+-#line 1187 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1909 "configure"
+ #include "confdefs.h"
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -1346,14 +1943,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1225: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:1948: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_stdc=$ac_arg; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ CC=$ac_save_CC
+ 
+@@ -1361,10 +1959,10 @@
+ 
+ case "x$ac_cv_prog_cc_stdc" in
+   x|xno)
+-    echo "configure:1237: result: none needed" >&5
++    echo "configure:1962: result: none needed" >&5
+ echo "${ECHO_T}none needed" >&6 ;;
+   *)
+-    echo "configure:1240: result: $ac_cv_prog_cc_stdc" >&5
++    echo "configure:1965: result: $ac_cv_prog_cc_stdc" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+     CC="$CC $ac_cv_prog_cc_stdc" ;;
+ esac
+@@ -1399,11 +1997,12 @@
+ # SunOS /usr/etc/install
+ # IRIX /sbin/install
+ # AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "configure:1277: checking for a BSD compatible install" >&5
++echo "configure:2005: checking for a BSD compatible install" >&5
+ echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+@@ -1413,19 +2012,21 @@
+   for ac_dir in $PATH; do
+     # Account for people who put trailing slashes in PATH elements.
+     case $ac_dir/ in
+-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
++    / | ./ | .// | /cC/* \
++    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
++    | /usr/ucb/* ) ;;
+     *)
+       # OSF1 and SCO ODT 3.0 have their own names for install.
+       # Don't use installbsd from OSF since it installs stuff as root
+       # by default.
+       for ac_prog in ginstall scoinst install; do
+-        if test -f $ac_dir/$ac_prog; then
++        if test -f "$ac_dir/$ac_prog"; then
+ 	  if test $ac_prog = install &&
+-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
++            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+ 	    :
+ 	  elif test $ac_prog = install &&
+-	    grep pwplus $ac_dir/$ac_prog >/dev/null 2>&1; then
++	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+@@ -1450,7 +2051,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "configure:1323: result: $INSTALL" >&5
++echo "configure:2054: result: $INSTALL" >&5
+ echo "${ECHO_T}$INSTALL" >&6
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -1461,7 +2062,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-echo "configure:1330: checking whether build environment is sane" >&5
++echo "configure:2065: checking whether build environment is sane" >&5
+ echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+ # Just in case
+ sleep 1
+@@ -1498,7 +2099,7 @@
+ Check your system clock" >&2; exit 1; }
+ fi
+ rm -f conftest*
+-echo "configure:1365: result: yes" >&5
++echo "configure:2102: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ if test "$program_transform_name" = s,x,x,; then
+   program_transform_name=
+@@ -1520,7 +2121,8 @@
+ test -z "$program_transform_name" && program_transform_name="s,x,x,"
+ 
+ test x"${MISSING+set}" = xset || \
+-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
++  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
++# Use eval to expand $SHELL
+ if eval "$MISSING --run :"; then
+   am_missing_run="$MISSING --run "
+ else
+@@ -1531,9 +2133,9 @@
+ 
+ for ac_prog in mawk gawk nawk awk
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1397: checking for $ac_word" >&5
++echo "configure:2138: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1546,7 +2148,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+ break
+ done
+@@ -1555,17 +2157,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "configure:1418: result: $AWK" >&5
++  echo "configure:2160: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "configure:1421: result: no" >&5
++  echo "configure:2163: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$AWK" && break
++  test -n "$AWK" && break
+ done
+ 
+-echo "configure:1426: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:2170: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+ if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+@@ -1585,11 +2187,11 @@
+ rm -f conftestmake
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "configure:1446: result: yes" >&5
++  echo "configure:2190: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+   SET_MAKE=
+ else
+-  echo "configure:1450: result: no" >&5
++  echo "configure:2194: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -1598,7 +2200,7 @@
+ if test "${enable_dependency_tracking+set}" = set; then
+   enableval="$enable_dependency_tracking"
+ 
+-fi
++fi;
+ if test "x$enable_dependency_tracking" = xno; then
+   AMDEP="#"
+ else
+@@ -1625,7 +2227,7 @@
+ ac_config_commands="$ac_config_commands default-2"
+ 
+ # test to see if srcdir already configured
+-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
++if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   { echo "configure: error: source directory already configured; run \"make distclean\" there first" >&2; exit 1; }
+ fi
+@@ -1663,9 +2265,12 @@
+          install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
+ fi
+ 
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++
+ depcc="$CC"
+ depcpp="$CPP"
+-echo "configure:1508: checking dependency style of $depcc" >&5
++echo "configure:2273: checking dependency style of $depcc" >&5
+ echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1689,10 +2294,13 @@
+       ;;
+     none) break ;;
+     esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
+     if depmode="$depmode" \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
++       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
+        grep conftest.h conftest.Po > /dev/null 2>&1; then
+       am_cv_CC_dependencies_compiler_type="$depmode"
+       break
+@@ -1706,7 +2314,7 @@
+ 
+ fi
+ 
+-echo "configure:1544: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "configure:2317: result: $am_cv_CC_dependencies_compiler_type" >&5
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+ CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
+ 
+@@ -1714,7 +2322,7 @@
+ $ac_config_sub sun4 >/dev/null 2>&1 ||
+   { echo "configure: error: cannot run $ac_config_sub" >&2; exit 1; }
+ 
+-echo "configure:1550: checking build system type" >&5
++echo "configure:2325: checking build system type" >&5
+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
+ if test "${ac_cv_build+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1727,14 +2335,14 @@
+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1
+ 
+ fi
+-echo "configure:1562: result: $ac_cv_build" >&5
++echo "configure:2338: result: $ac_cv_build" >&5
+ echo "${ECHO_T}$ac_cv_build" >&6
+ build=$ac_cv_build
+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ 
+-echo "configure:1568: checking host system type" >&5
++echo "configure:2345: checking host system type" >&5
+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
+ if test "${ac_cv_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1745,7 +2353,7 @@
+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1
+ 
+ fi
+-echo "configure:1578: result: $ac_cv_host" >&5
++echo "configure:2356: result: $ac_cv_host" >&5
+ echo "${ECHO_T}$ac_cv_host" >&6
+ host=$ac_cv_host
+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+@@ -1791,9 +2399,9 @@
+ 
+ for ac_prog in 'bison -y' byacc
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1620: checking for $ac_word" >&5
++echo "configure:2404: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_YACC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1806,7 +2414,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_YACC="$ac_prog"
+ break
+ done
+@@ -1815,22 +2423,22 @@
+ fi
+ YACC=$ac_cv_prog_YACC
+ if test -n "$YACC"; then
+-  echo "configure:1641: result: $YACC" >&5
++  echo "configure:2426: result: $YACC" >&5
+ echo "${ECHO_T}$YACC" >&6
+ else
+-  echo "configure:1644: result: no" >&5
++  echo "configure:2429: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$YACC" && break
++  test -n "$YACC" && break
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
+ for ac_prog in flex lex
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1654: checking for $ac_word" >&5
++echo "configure:2441: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LEX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1843,7 +2451,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_LEX="$ac_prog"
+ break
+ done
+@@ -1852,20 +2460,22 @@
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  echo "configure:1675: result: $LEX" >&5
++  echo "configure:2463: result: $LEX" >&5
+ echo "${ECHO_T}$LEX" >&6
+ else
+-  echo "configure:1678: result: no" >&5
++  echo "configure:2466: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$LEX" && break
++  test -n "$LEX" && break
+ done
+ test -n "$LEX" || LEX="${am_missing_run}flex"
+ 
+-# Extract the first word of "flex", so it can be a program name with args.
+-set dummy flex; ac_word=$2
+-echo "configure:1686: checking for $ac_word" >&5
++for ac_prog in flex lex
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2478: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_LEX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1878,44 +2488,38 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_LEX="flex"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_LEX="$ac_prog"
+ break
+ done
+ 
+-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+ fi
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  echo "configure:1708: result: $LEX" >&5
++  echo "configure:2500: result: $LEX" >&5
+ echo "${ECHO_T}$LEX" >&6
+ else
+-  echo "configure:1711: result: no" >&5
++  echo "configure:2503: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
+ if test -z "$LEXLIB"
+ then
+-  case $LEX in
+-  flex*) ac_lib=fl ;;
+-  *) ac_lib=l ;;
+-  esac
+ 
+-ac_ac_Lib=`echo "ac_cv_lib_$ac_lib_yywrap" | $ac_tr_sh`
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:1725: checking for yywrap in -l$ac_lib" >&5
+-echo $ECHO_N "checking for yywrap in -l$ac_lib... $ECHO_C" >&6
+-if eval "test \"\${$ac_ac_Lib+set}\" = set"; then
++echo "configure:2514: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$ac_lib  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 1733 "configure"
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2522 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1932,26 +2536,73 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1750: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  eval "$ac_ac_Lib=yes"
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2541: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_fl_yywrap=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+-  eval "$ac_ac_Lib=no"
++  ac_cv_lib_fl_yywrap=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:1760: result: `eval echo '${'$ac_ac_Lib'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$ac_ac_Lib'}'`" >&6
+-if test `eval echo '${'$ac_ac_Lib'}'` = yes; then
+-  LEXLIB="-l$ac_lib"
++echo "configure:2551: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
++if test $ac_cv_lib_fl_yywrap = yes; then
++  LEXLIB="-lfl"
++else
++
++echo "configure:2557: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2565 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2584: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_l_yywrap=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_l_yywrap=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:2594: result: $ac_cv_lib_l_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
++if test $ac_cv_lib_l_yywrap = yes; then
++  LEXLIB="-ll"
++fi
++
+ fi
+ 
+ fi
+ 
+-echo "configure:1766: checking lex output file root" >&5
++if test "x$LEX" != "x:"; then
++  echo "configure:2605: checking lex output file root" >&5
+ echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+ if test "${ac_cv_prog_lex_root+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1968,11 +2619,11 @@
+   { echo "configure: error: cannot find output from $LEX; giving up" >&2; exit 1; }
+ fi
+ fi
+-echo "configure:1783: result: $ac_cv_prog_lex_root" >&5
++echo "configure:2622: result: $ac_cv_prog_lex_root" >&5
+ echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+ 
+-echo "configure:1786: checking whether yytext is a pointer" >&5
++echo "configure:2626: checking whether yytext is a pointer" >&5
+ echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
+ if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1984,21 +2635,22 @@
+ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+ ac_save_LIBS=$LIBS
+ LIBS="$LIBS $LEXLIB"
+-cat >conftest.$ac_ext <<EOF
++cat >conftest.$ac_ext <<_ACEOF
+ `cat $LEX_OUTPUT_ROOT.c`
+-EOF
+-if { (eval echo configure:1801: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2642: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_prog_lex_yytext_pointer=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_save_LIBS
+ rm -f "${LEX_OUTPUT_ROOT}.c"
+ 
+ fi
+-echo "configure:1811: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "configure:2653: result: $ac_cv_prog_lex_yytext_pointer" >&5
+ echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+ if test $ac_cv_prog_lex_yytext_pointer = yes; then
+ 
+@@ -2008,43 +2660,83 @@
+ 
+ fi
+ 
+-# Extract the first word of "ranlib", so it can be a program name with args.
++fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo "configure:2668: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++break
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "configure:2690: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "configure:2693: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "configure:1820: checking for $ac_word" >&5
++echo "configure:2702: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+   ac_save_IFS=$IFS; IFS=':'
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_RANLIB="ranlib"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_RANLIB="ranlib"
+ break
+ done
+ 
+-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "configure:1842: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "configure:2725: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "configure:1845: result: no" >&5
++  echo "configure:2728: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
++  RANLIB=$ac_ct_RANLIB
++fi
++
+ for ac_prog in mawk gawk nawk awk
+ do
+-# Extract the first word of "$ac_prog", so it can be a program name with args.
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "configure:1852: checking for $ac_word" >&5
++echo "configure:2739: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_AWK+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2057,7 +2749,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_AWK="$ac_prog"
+ break
+ done
+@@ -2066,17 +2758,17 @@
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "configure:1873: result: $AWK" >&5
++  echo "configure:2761: result: $AWK" >&5
+ echo "${ECHO_T}$AWK" >&6
+ else
+-  echo "configure:1876: result: no" >&5
++  echo "configure:2764: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-test -n "$AWK" && break
++  test -n "$AWK" && break
+ done
+ 
+-echo "configure:1881: checking for ln -s or something else" >&5
++echo "configure:2771: checking for ln -s or something else" >&5
+ echo $ECHO_N "checking for ln -s or something else... $ECHO_C" >&6
+ if test "${ac_cv_prog_LN_S+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2097,14 +2789,14 @@
+ fi
+ fi
+ LN_S="$ac_cv_prog_LN_S"
+-echo "configure:1902: result: $ac_cv_prog_LN_S" >&5
++echo "configure:2792: result: $ac_cv_prog_LN_S" >&5
+ echo "${ECHO_T}$ac_cv_prog_LN_S" >&6
+ 
+ # Check whether --with-mips_abi or --without-mips_abi was given.
+ if test "${with_mips_abi+set}" = set; then
+   withval="$with_mips_abi"
+ 
+-fi
++fi;
+ 
+ case "$host_os" in
+ irix*)
+@@ -2129,7 +2821,7 @@
+ esac
+ if test -n "$abi" ; then
+ ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
+-echo "configure:1929: checking if $CC supports the $abi option" >&5
++echo "configure:2824: checking if $CC supports the $abi option" >&5
+ echo $ECHO_N "checking if $CC supports the $abi option... $ECHO_C" >&6
+ if eval "test \"\${$ac_foo+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2137,8 +2829,8 @@
+ 
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $abi"
+-cat >conftest.$ac_ext <<EOF
+-#line 1937 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2833 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2148,21 +2840,22 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1947: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2845: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval $ac_foo=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval $ac_foo=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ CFLAGS="$save_CFLAGS"
+ 
+ fi
+ 
+ ac_res=`eval echo \\\$$ac_foo`
+-echo "configure:1958: result: $ac_res" >&5
++echo "configure:2858: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6
+ if test $ac_res = no; then
+ # Try to figure out why that failed...
+@@ -2170,8 +2863,8 @@
+ 	-mabi=32)
+ 	save_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS -mabi=n32"
+-	cat >conftest.$ac_ext <<EOF
+-#line 1967 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 2867 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -2181,15 +2874,16 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:1977: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2879: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_res=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_res=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	CLAGS="$save_CFLAGS"
+ 	if test $ac_res = yes; then
+ 		# New GCC
+@@ -2227,14 +2921,14 @@
+ CC="$CC $abi"
+ libdir="$libdir$abilibdirext"
+ 
+-echo "configure:2020: checking for __attribute__" >&5
++echo "configure:2924: checking for __attribute__" >&5
+ echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
+ if test "${ac_cv___attribute__+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 2026 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2931 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdlib.h>
+@@ -2254,15 +2948,16 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2042: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2953: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv___attribute__=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv___attribute__=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ if test "$ac_cv___attribute__" = "yes"; then
+@@ -2272,7 +2967,7 @@
+ EOF
+ 
+ fi
+-echo "configure:2056: result: $ac_cv___attribute__" >&5
++echo "configure:2970: result: $ac_cv___attribute__" >&5
+ echo "${ECHO_T}$ac_cv___attribute__" >&6
+ 
+ # Check whether --enable-shared or --disable-shared was given.
+@@ -2296,7 +2991,7 @@
+ esac
+ else
+   enable_shared=no
+-fi
++fi;
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+   enableval="$enable_static"
+@@ -2318,7 +3013,7 @@
+ esac
+ else
+   enable_static=yes
+-fi
++fi;
+ # Check whether --enable-fast-install or --disable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+   enableval="$enable_fast_install"
+@@ -2340,26 +3035,21 @@
+ esac
+ else
+   enable_fast_install=yes
+-fi
++fi;
++
+ # Check whether --with-gnu-ld or --without-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+   withval="$with_gnu_ld"
+   test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+-fi
++fi;
+ ac_prog=ld
+-if test "$ac_cv_prog_gcc" = yes; then
++if test "$ac_cv_c_compiler_gnu" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "configure:2134: checking for ld used by GCC" >&5
++  echo "configure:3050: checking for ld used by GCC" >&5
+ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
++  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+   case "$ac_prog" in
+     # Accept absolute paths.
+     [\\/]* | [A-Za-z]:[\\/]*)
+@@ -2381,10 +3071,10 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo "configure:2164: checking for GNU ld" >&5
++  echo "configure:3074: checking for GNU ld" >&5
+ echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+ else
+-  echo "configure:2167: checking for non-GNU ld" >&5
++  echo "configure:3077: checking for non-GNU ld" >&5
+ echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ fi
+ if test "${ac_cv_path_LD+set}" = set; then
+@@ -2414,14 +3104,14 @@
+ 
+ LD="$ac_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "configure:2196: result: $LD" >&5
++  echo "configure:3107: result: $LD" >&5
+ echo "${ECHO_T}$LD" >&6
+ else
+-  echo "configure:2199: result: no" >&5
++  echo "configure:3110: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" >&2; exit 1; }
+-echo "configure:2203: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:3114: checking if the linker ($LD) is GNU ld" >&5
+ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnu_ld+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2433,23 +3123,10 @@
+   ac_cv_prog_gnu_ld=no
+ fi
+ fi
+-echo "configure:2215: result: $ac_cv_prog_gnu_ld" >&5
++echo "configure:3126: result: $ac_cv_prog_gnu_ld" >&5
+ echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6
+-with_gnu_ld=$ac_cv_prog_gnu_ld
+-
+-echo "configure:2218: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+-if test "${lt_cv_ld_reload_flag+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_ld_reload_flag='-r'
+-fi
+-echo "configure:2225: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
+ 
+-echo "configure:2229: checking for BSD-compatible nm" >&5
++echo "configure:3129: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+ if test "${ac_cv_path_NM+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2461,19 +3138,18 @@
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+     test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -B"
++      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -B"
+ 	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -p"
++      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	ac_cv_path_NM="$ac_dir/nm -p"
+ 	break
+       else
+-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
++	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+ 	continue # so that we can try to find one that supports BSD flags
+       fi
+     fi
+@@ -2483,487 +3159,64 @@
+ fi
+ fi
+ 
+-NM="$ac_cv_path_NM"
+-echo "configure:2263: result: $NM" >&5
+-echo "${ECHO_T}$NM" >&6
+-
+-echo "configure:2265: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+-if test "${ac_cv_prog_LN_S+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  rm -f conftest.sym conftest.file
+-echo >conftest.file
+-if ln -s conftest.file conftest.sym 2>/dev/null; then
+-  ac_cv_prog_LN_S="ln -s"
+-else
+-  ac_cv_prog_LN_S=ln
+-fi
+-fi
+-LN_S=$ac_cv_prog_LN_S
+-if test "$ac_cv_prog_LN_S" = "ln -s"; then
+-  echo "configure:2280: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "configure:2283: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-echo "configure:2286: checking how to recognise dependant libraries" >&5
+-echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_file_magic_cmd='${MAGIC}'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [regex]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
+-
+-case "$host_os" in
+-aix4*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-bsdi4*)
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+-
+-cygwin* | mingw*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
+-  ;;
+-
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case "$host_cpu" in
+-    i*86 )
+-            lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
+-            lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20*)
+-  # TODO:  Does this work for hpux-11 too?
+-  lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
+-
+-irix5* | irix6*)
+-  case "$host_os" in
+-  irix5*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case "$LD" in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-        lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-        ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux-gnu*)
+-  case "$host_cpu" in
+-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-      esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  ;;
+-
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
+-  else
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-        lt_cv_file_magic_cmd='/usr/bin/file -L'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-  fi
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
+-
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case "$host_vendor" in
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  motorola)
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  esac
+-  ;;
+-esac
+-
+-fi
+-echo "configure:2407: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-
+-# Only perform the check for file, if the check method requires it
+-case "$deplibs_check_method" in
+-file_magic*)
+-  if test "$file_magic_cmd" = '${MAGIC}'; then
+-    echo "configure:2415: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/${ac_tool_prefix}file; then
+-      lt_cv_path_MAGIC="$ac_dir/${ac_tool_prefix}file"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac
+-fi
+-
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  echo "configure:2467: result: $MAGIC" >&5
+-echo "${ECHO_T}$MAGIC" >&6
+-else
+-  echo "configure:2470: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -z "$lt_cv_path_MAGIC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    echo "configure:2475: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/file; then
+-      lt_cv_path_MAGIC="$ac_dir/file"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac
+-fi
+-
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  echo "configure:2527: result: $MAGIC" >&5
+-echo "${ECHO_T}$MAGIC" >&6
+-else
+-  echo "configure:2530: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  else
+-    MAGIC=:
+-  fi
+-fi
+-
+-  fi
+-  ;;
+-esac
+-
+-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "configure:2542: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-break
+-done
+-
+-fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "configure:2563: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
+-else
+-  echo "configure:2566: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -z "$ac_cv_prog_RANLIB"; then
+-  if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo "configure:2573: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_RANLIB"; then
+-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_ac_ct_RANLIB="ranlib"
+-break
+-done
+-
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  echo "configure:2595: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+-  echo "configure:2598: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-    RANLIB="$ac_ct_RANLIB"
+-  else
+-    RANLIB=":"
+-  fi
+-fi
+-
+-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "configure:2608: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-break
+-done
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  echo "configure:2629: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
+-else
+-  echo "configure:2632: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-if test -z "$ac_cv_prog_STRIP"; then
+-  if test -n "$ac_tool_prefix"; then
+-    # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-echo "configure:2639: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  test -f $ac_dir/$ac_word || continue
+-ac_cv_prog_ac_ct_STRIP="strip"
+-break
+-done
++NM="$ac_cv_path_NM"
++echo "configure:3163: result: $NM" >&5
++echo "${ECHO_T}$NM" >&6
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++echo "configure:3166: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++if test "${ac_cv_prog_LN_S+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f conftest.sym conftest.file
++echo >conftest.file
++if ln -s conftest.file conftest.sym 2>/dev/null; then
++  ac_cv_prog_LN_S="ln -s"
++elif ln conftest.file conftest.sym 2>/dev/null; then
++  ac_cv_prog_LN_S=ln
++else
++  ac_cv_prog_LN_S=cp
+ fi
++rm -f conftest.sym conftest.file
+ fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  echo "configure:2661: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++LN_S=$ac_cv_prog_LN_S
++
++if test "$ac_cv_prog_LN_S" = "ln -s"; then
++  echo "configure:3185: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "configure:2664: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "configure:3188: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-    STRIP="$ac_ct_STRIP"
+-  else
+-    STRIP=":"
+-  fi
+-fi
++case "$target" in
++NONE) lt_target="$host" ;;
++*) lt_target="$target" ;;
++esac
+ 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+ test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
++test "$ac_cv_c_compiler_gnu" = yes && libtool_flags="$libtool_flags --with-gcc"
+ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+ 
+ # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+ if test "${enable_libtool_lock+set}" = set; then
+   enableval="$enable_libtool_lock"
+ 
+-fi
++fi;
+ test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+ 
+-# Check whether --with-pic or --without-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
+-else
+-  pic_mode=default
+-fi
+-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
+-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
+-
+ # Some flags need to be propagated to the compiler or linker for good
+ # libtool support.
+-case "$host" in
++case "$lt_target" in
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 2699 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:2700: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++  echo '#line 3218 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:3219: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
+     case "`/usr/bin/file conftest.o`" in
+     *32-bit*)
+       LD="${LD-ld} -32"
+@@ -2983,21 +3236,13 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  echo "configure:2719: checking whether the C compiler needs -belf" >&5
++  echo "configure:3239: checking whether the C compiler needs -belf" >&5
+ echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+ if test "${lt_cv_cc_needs_belf+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-
+-     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-
+-     cat >conftest.$ac_ext <<EOF
+-#line 2731 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3245 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3007,24 +3252,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2740: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3257: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lt_cv_cc_needs_belf=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   lt_cv_cc_needs_belf=no
+ fi
+-rm -f conftest*
+-     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_gnu_compiler=$ac_cv_prog_gcc
+-
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:2755: result: $lt_cv_cc_needs_belf" >&5
++echo "configure:3266: result: $lt_cv_cc_needs_belf" >&5
+ echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+@@ -3038,18 +3277,17 @@
+ cat >confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+-# scripts and configure runs.  It is not useful on other systems.
+-# If it contains results you don't want to keep, you may remove or edit it.
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
+ #
+-# By default, configure uses `config.cache' as the cache file,
+-# creating it if it does not exist already.  You can give configure
+-# the --cache-file=FILE option to use a different cache file; that is
+-# what configure does when it calls configure scripts in
+-# subdirectories, so they share the cache.
+-# Giving --cache-file=/dev/null disables caching, for debugging configure.
+-# config.status only pays attention to the cache file if you give it the
+-# --recheck option to rerun configure.
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
+ #
++# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
+ EOF
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+@@ -3072,7 +3310,7 @@
+       ;;
+     esac;
+ } |
+-  sed 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
++  sed '/^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
+ if cmp -s $cache_file confcache; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+@@ -3084,14 +3322,12 @@
+ rm -f confcache
+ 
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
++CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
++LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
++LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
++DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
++$libtool_flags $ac_aux_dir/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" >&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -3134,6 +3370,7 @@
+ fi
+ 
+ berkeley_db=db
++
+ # Check whether --with-berkeley-db or --without-berkeley-db was given.
+ if test "${with_berkeley_db+set}" = set; then
+   withval="$with_berkeley_db"
+@@ -3142,7 +3379,7 @@
+ 	berkeley_db=""
+ fi
+ 
+-fi
++fi;
+ if test "$berkeley_db"; then
+ 
+ for ac_header in 				\
+@@ -3151,35 +3388,41 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:2873: checking for $ac_header" >&5
++
++echo "configure:3392: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 2879 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3398 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2884: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:3404: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:2896: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:3425: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3191,7 +3434,7 @@
+ 
+ fi
+ 
+-echo "configure:2905: checking for dbopen" >&5
++echo "configure:3437: checking for dbopen" >&5
+ echo $ECHO_N "checking for dbopen... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dbopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3206,8 +3449,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 2920 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 3453 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -3224,14 +3467,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2936: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3472: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbopen=$ac_lib; else ac_cv_funclib_dbopen=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dbopen=\${ac_cv_funclib_dbopen-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -3246,13 +3490,13 @@
+ for ac_func in dbopen
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:2954: checking for $ac_func" >&5
++echo "configure:3493: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 2960 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3499 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3281,17 +3525,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:2988: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3530: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:2997: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:3539: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3315,13 +3560,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:3017: result: yes" >&5
++	echo "configure:3563: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dbopen=no"
+ 	eval "LIB_dbopen="
+-	echo "configure:3023: result: no" >&5
++	echo "configure:3569: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -3335,12 +3580,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:3035: result: yes, in $ac_res" >&5
++	echo "configure:3583: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:3039: checking for dbm_firstkey" >&5
++echo "configure:3588: checking for dbm_firstkey" >&5
+ echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3355,8 +3600,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 3054 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 3604 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3366,14 +3611,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3064: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3616: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dbm_firstkey=\${ac_cv_funclib_dbm_firstkey-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -3388,13 +3634,13 @@
+ for ac_func in dbm_firstkey
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:3082: checking for $ac_func" >&5
++echo "configure:3637: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3088 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3643 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3423,17 +3669,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3116: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3674: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:3125: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:3683: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3457,13 +3704,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:3145: result: yes" >&5
++	echo "configure:3707: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dbm_firstkey=no"
+ 	eval "LIB_dbm_firstkey="
+-	echo "configure:3151: result: no" >&5
++	echo "configure:3713: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -3477,12 +3724,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:3163: result: yes, in $ac_res" >&5
++	echo "configure:3727: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:3167: checking for db_create" >&5
++echo "configure:3732: checking for db_create" >&5
+ echo $ECHO_N "checking for db_create... $ECHO_C" >&6
+ if test "${ac_cv_funclib_db_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3497,8 +3744,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 3182 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 3748 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3508,14 +3755,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3192: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3760: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_db_create=$ac_lib; else ac_cv_funclib_db_create=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_db_create=\${ac_cv_funclib_db_create-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -3530,13 +3778,13 @@
+ for ac_func in db_create
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:3210: checking for $ac_func" >&5
++echo "configure:3781: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3216 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3787 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -3565,17 +3813,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3244: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:3818: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:3253: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:3827: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3599,13 +3848,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:3273: result: yes" >&5
++	echo "configure:3851: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_db_create=no"
+ 	eval "LIB_db_create="
+-	echo "configure:3279: result: no" >&5
++	echo "configure:3857: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -3619,7 +3868,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:3291: result: yes, in $ac_res" >&5
++	echo "configure:3871: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -3632,32 +3881,33 @@
+ 	DBLIB="$DBLIB $LIB_dbm_firstkey"
+ fi
+ 
+-echo "configure:3302: checking for inline" >&5
++echo "configure:3884: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<EOF
+-#line 3310 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3892 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ $ac_kw int foo () {return 0; }
+ #endif
+ 
+-EOF
+-if { (eval echo configure:3316: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3900: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+-echo "configure:3325: result: $ac_cv_c_inline" >&5
++echo "configure:3910: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -3672,13 +3922,13 @@
+  ;;
+ esac
+ 
+-echo "configure:3339: checking for an ANSI C-conforming const" >&5
++echo "configure:3925: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3345 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3931 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -3734,17 +3984,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3399: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3989: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_c_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3408: result: $ac_cv_c_const" >&5
++echo "configure:3998: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -3754,27 +4005,35 @@
+ 
+ fi
+ 
+-echo "configure:3415: checking for ANSI C header files" >&5
++echo "configure:4008: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3421 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4014 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3429: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4023: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+@@ -3783,12 +4042,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 3443 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4046 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "memchr" >/dev/null 2>&1; then
+   :
+@@ -3801,12 +4060,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 3458 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4064 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "free" >/dev/null 2>&1; then
+   :
+@@ -3822,8 +4081,8 @@
+   if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3476 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4085 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -3847,21 +4106,22 @@
+       exit(2);
+   exit (0);
+ }
+-EOF
+-if { (eval echo configure:3500: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:4111: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+ fi
+-echo "configure:3512: result: $ac_cv_header_stdc" >&5
++echo "configure:4124: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -3871,13 +4131,13 @@
+ 
+ fi
+ 
+-echo "configure:3519: checking for size_t" >&5
++echo "configure:4134: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3525 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4140 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -3890,17 +4150,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3539: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4155: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_size_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3548: result: $ac_cv_type_size_t" >&5
++echo "configure:4164: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -3912,13 +4173,13 @@
+ 
+ fi
+ 
+-echo "configure:3557: checking for pid_t" >&5
++echo "configure:4176: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3563 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4182 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -3931,17 +4192,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3577: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4197: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_pid_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3586: result: $ac_cv_type_pid_t" >&5
++echo "configure:4206: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -3953,17 +4215,17 @@
+ 
+ fi
+ 
+-echo "configure:3595: checking for uid_t in sys/types.h" >&5
++echo "configure:4218: checking for uid_t in sys/types.h" >&5
+ echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3601 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4224 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "uid_t" >/dev/null 2>&1; then
+   ac_cv_type_uid_t=yes
+@@ -3973,7 +4235,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:3613: result: $ac_cv_type_uid_t" >&5
++echo "configure:4238: result: $ac_cv_type_uid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+ if test $ac_cv_type_uid_t = no; then
+ 
+@@ -3987,13 +4249,13 @@
+ 
+ fi
+ 
+-echo "configure:3623: checking return type of signal handlers" >&5
++echo "configure:4252: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3629 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4258 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -4013,17 +4275,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3649: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4280: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=void
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_signal=int
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3658: result: $ac_cv_type_signal" >&5
++echo "configure:4289: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -4038,13 +4301,13 @@
+ 
+ fi
+ 
+-echo "configure:3669: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:4304: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3675 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4310 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -4057,17 +4320,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3688: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4325: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_time=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:3697: result: $ac_cv_header_time" >&5
++echo "configure:4334: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -4080,35 +4344,41 @@
+ for ac_header in standards.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:3711: checking for $ac_header" >&5
++
++echo "configure:4348: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3717 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4354 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3722: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4360: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:3734: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:4381: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4122,13 +4392,13 @@
+ 
+ cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-echo "configure:3744: checking for $i" >&5
++echo "configure:4395: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3750 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4401 "configure"
+ #include "confdefs.h"
+ \
+ #ifdef HAVE_STANDARDS_H
+@@ -4136,21 +4406,30 @@
+ #endif
+ #include <$i>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3759: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4411: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "ac_cv_header_$cv=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_header_$cv=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:3771: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "configure:4432: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
+ ac_res=`eval echo \\$ac_cv_header_$cv`
+ if test "$ac_res" = yes; then
+@@ -4167,35 +4446,41 @@
+ for ac_header in netinet/ip.h netinet/tcp.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:3790: checking for $ac_header" >&5
++
++echo "configure:4450: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3796 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4456 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3801: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4462: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:3813: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:4483: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4210,13 +4495,13 @@
+ for ac_func in getlogin setlogin
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:3825: checking for $ac_func" >&5
++echo "configure:4498: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3831 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4504 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4245,17 +4530,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:3859: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:4535: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:3868: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:4544: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4266,7 +4552,7 @@
+ done
+ 
+ if test "$ac_cv_func_getlogin" = yes; then
+-echo "configure:3877: checking if getlogin is posix" >&5
++echo "configure:4555: checking if getlogin is posix" >&5
+ echo $ECHO_N "checking if getlogin is posix... $ECHO_C" >&6
+ if test "${ac_cv_func_getlogin_posix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4279,7 +4565,7 @@
+ fi
+ 
+ fi
+-echo "configure:3888: result: $ac_cv_func_getlogin_posix" >&5
++echo "configure:4568: result: $ac_cv_func_getlogin_posix" >&5
+ echo "${ECHO_T}$ac_cv_func_getlogin_posix" >&6
+ if test "$ac_cv_func_getlogin_posix" = yes; then
+ 	
+@@ -4290,7 +4576,7 @@
+ fi
+ fi
+ 
+-echo "configure:3897: checking if realloc if broken" >&5
++echo "configure:4579: checking if realloc if broken" >&5
+ echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
+ if test "${ac_cv_func_realloc_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4300,8 +4586,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3907 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4590 "configure"
+ #include "confdefs.h"
+ 
+ #include <stddef.h>
+@@ -4312,20 +4598,21 @@
+ 	return realloc(NULL, 17) == NULL;
+ }
+ 
+-EOF
+-if { (eval echo configure:3916: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:4603: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_realloc_broken=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:3927: result: $ac_cv_func_realloc_broken" >&5
++echo "configure:4615: result: $ac_cv_func_realloc_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
+ if test "$ac_cv_func_realloc_broken" = yes ; then
+ 	
+@@ -4352,13 +4639,13 @@
+   WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
+ fi
+ 
+-echo "configure:3950: checking for ssize_t" >&5
++echo "configure:4642: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3956 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4648 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4366,7 +4653,7 @@
+ #include <stddef.h>
+ #endif
+ #include <unistd.h>
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_ssize_t=yes
+@@ -4376,7 +4663,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:3973: result: $ac_cv_type_ssize_t" >&5
++echo "configure:4666: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = no; then
+ 
+@@ -4387,13 +4674,13 @@
+ fi
+ 
+ cv=`echo "long long" | sed 'y%./+- %__p__%'`
+-echo "configure:3981: checking for long long" >&5
++echo "configure:4677: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 3987 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4683 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -4408,29 +4695,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4002: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4700: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:4012: result: $ac_foo" >&5
++echo "configure:4710: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:4017: checking for long long" >&5
++	echo "configure:4715: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4023 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4721 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4443,17 +4731,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4037: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4736: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_long_long=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_long_long=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:4046: result: $ac_cv_type_long_long" >&5
++echo "configure:4745: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+ 
+@@ -4524,35 +4813,41 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:4114: checking for $ac_header" >&5
++
++echo "configure:4817: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4120 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4823 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4125: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:4829: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:4137: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:4850: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4603,27 +4898,27 @@
+ if test "$withval" = "no"; then
+ 	ac_cv_lib_ipv6=no
+ fi
+-fi
++fi;
+ if test "${ac_cv_lib_ipv6+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   v6type=unknown
+ v6lib=none
+ 
+-echo "configure:4186: checking ipv6 stack type" >&5
++echo "configure:4908: checking ipv6 stack type" >&5
+ echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
+ for i in v6d toshiba kame inria zeta linux; do
+ 	case $i in
+ 	v6d)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4192 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4914 "configure"
+ #include "confdefs.h"
+ dnl
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=v6;
+@@ -4634,15 +4929,15 @@
+ 
+ 		;;
+ 	toshiba)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4210 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4933 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -4653,15 +4948,15 @@
+ 
+ 		;;
+ 	kame)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4228 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4952 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -4672,15 +4967,15 @@
+ 
+ 		;;
+ 	inria)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4246 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4971 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; CFLAGS="-DINET6 $CFLAGS"
+@@ -4689,15 +4984,15 @@
+ 
+ 		;;
+ 	zeta)
+-		cat >conftest.$ac_ext <<EOF
+-#line 4262 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 4988 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -4720,7 +5015,7 @@
+ 		break
+ 	fi
+ done
+-echo "configure:4291: result: $v6type" >&5
++echo "configure:5018: result: $v6type" >&5
+ echo "${ECHO_T}$v6type" >&6
+ 
+ if test "$v6lib" != "none"; then
+@@ -4731,8 +5026,8 @@
+ 		fi
+ 	done
+ fi
+-cat >conftest.$ac_ext <<EOF
+-#line 4302 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 5030 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -4765,20 +5060,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4330: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5065: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipv6=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ipv6=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "configure:4339: checking for IPv6" >&5
++echo "configure:5075: checking for IPv6" >&5
+ echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
+-echo "configure:4341: result: $ac_cv_lib_ipv6" >&5
++echo "configure:5077: result: $ac_cv_lib_ipv6" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 
+@@ -4788,7 +5084,7 @@
+ 
+ fi
+ 
+-echo "configure:4348: checking for socket" >&5
++echo "configure:5087: checking for socket" >&5
+ echo $ECHO_N "checking for socket... $ECHO_C" >&6
+ if test "${ac_cv_funclib_socket+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4803,8 +5099,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4363 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5103 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4814,14 +5110,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4373: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5115: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -4836,13 +5133,13 @@
+ for ac_func in socket
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4391: checking for $ac_func" >&5
++echo "configure:5136: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4397 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5142 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4871,17 +5168,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4425: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5173: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4434: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5182: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4905,13 +5203,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4454: result: yes" >&5
++	echo "configure:5206: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_socket=no"
+ 	eval "LIB_socket="
+-	echo "configure:4460: result: no" >&5
++	echo "configure:5212: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -4925,7 +5223,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4472: result: yes, in $ac_res" >&5
++	echo "configure:5226: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -4934,7 +5232,7 @@
+ 	LIBS="$LIB_socket $LIBS"
+ fi
+ 
+-echo "configure:4479: checking for gethostbyname" >&5
++echo "configure:5235: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4949,8 +5247,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4494 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5251 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4960,14 +5258,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4504: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5263: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -4982,13 +5281,13 @@
+ for ac_func in gethostbyname
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4522: checking for $ac_func" >&5
++echo "configure:5284: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4528 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5290 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5017,17 +5316,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4556: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5321: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4565: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5330: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5051,13 +5351,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4585: result: yes" >&5
++	echo "configure:5354: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname=no"
+ 	eval "LIB_gethostbyname="
+-	echo "configure:4591: result: no" >&5
++	echo "configure:5360: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5071,7 +5371,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4603: result: yes, in $ac_res" >&5
++	echo "configure:5374: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5080,7 +5380,7 @@
+ 	LIBS="$LIB_gethostbyname $LIBS"
+ fi
+ 
+-echo "configure:4610: checking for syslog" >&5
++echo "configure:5383: checking for syslog" >&5
+ echo $ECHO_N "checking for syslog... $ECHO_C" >&6
+ if test "${ac_cv_funclib_syslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5095,8 +5395,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4625 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5399 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5106,14 +5406,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4635: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5411: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5128,13 +5429,13 @@
+ for ac_func in syslog
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4653: checking for $ac_func" >&5
++echo "configure:5432: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4659 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5438 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5163,17 +5464,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4687: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5469: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4696: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5478: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5197,13 +5499,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4716: result: yes" >&5
++	echo "configure:5502: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_syslog=no"
+ 	eval "LIB_syslog="
+-	echo "configure:4722: result: no" >&5
++	echo "configure:5508: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5217,7 +5519,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4734: result: yes, in $ac_res" >&5
++	echo "configure:5522: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5226,7 +5528,7 @@
+ 	LIBS="$LIB_syslog $LIBS"
+ fi
+ 
+-echo "configure:4741: checking for gethostbyname2" >&5
++echo "configure:5531: checking for gethostbyname2" >&5
+ echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5241,8 +5543,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4756 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5547 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5252,14 +5554,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4766: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5559: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5274,13 +5577,13 @@
+ for ac_func in gethostbyname2
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4784: checking for $ac_func" >&5
++echo "configure:5580: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4790 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5586 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5309,17 +5612,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4818: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5617: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4827: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5626: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5343,13 +5647,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4847: result: yes" >&5
++	echo "configure:5650: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname2=no"
+ 	eval "LIB_gethostbyname2="
+-	echo "configure:4853: result: no" >&5
++	echo "configure:5656: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5363,7 +5667,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:4865: result: yes, in $ac_res" >&5
++	echo "configure:5670: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5372,7 +5676,7 @@
+ 	LIBS="$LIB_gethostbyname2 $LIBS"
+ fi
+ 
+-echo "configure:4872: checking for res_search" >&5
++echo "configure:5679: checking for res_search" >&5
+ echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+ if test "${ac_cv_funclib_res_search+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5387,8 +5691,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 4887 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5695 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5412,14 +5716,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4910: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5721: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5434,13 +5739,13 @@
+ for ac_func in res_search
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:4928: checking for $ac_func" >&5
++echo "configure:5742: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 4934 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5748 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5469,17 +5774,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:4962: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5779: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:4971: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5788: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5503,13 +5809,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:4991: result: yes" >&5
++	echo "configure:5812: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_search=no"
+ 	eval "LIB_res_search="
+-	echo "configure:4997: result: no" >&5
++	echo "configure:5818: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5523,7 +5829,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5009: result: yes, in $ac_res" >&5
++	echo "configure:5832: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5532,7 +5838,7 @@
+ 	LIBS="$LIB_res_search $LIBS"
+ fi
+ 
+-echo "configure:5016: checking for dn_expand" >&5
++echo "configure:5841: checking for dn_expand" >&5
+ echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5547,8 +5853,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5031 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 5857 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5572,14 +5878,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5054: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5883: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -5594,13 +5901,13 @@
+ for ac_func in dn_expand
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5072: checking for $ac_func" >&5
++echo "configure:5904: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5078 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5910 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5629,17 +5936,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5106: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5941: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5115: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:5950: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5663,13 +5971,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5135: result: yes" >&5
++	echo "configure:5974: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dn_expand=no"
+ 	eval "LIB_dn_expand="
+-	echo "configure:5141: result: no" >&5
++	echo "configure:5980: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5683,7 +5991,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5153: result: yes, in $ac_res" >&5
++	echo "configure:5994: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -5692,7 +6000,7 @@
+ 	LIBS="$LIB_dn_expand $LIBS"
+ fi
+ 
+-echo "configure:5160: checking for working snprintf" >&5
++echo "configure:6003: checking for working snprintf" >&5
+ echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5701,8 +6009,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5170 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6013 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5713,20 +6021,21 @@
+ 	snprintf(foo, 2, "12");
+ 	return strcmp(foo, "1");
+ }
+-EOF
+-if { (eval echo configure:5181: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:6026: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_snprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:5192: result: $ac_cv_func_snprintf_working" >&5
++echo "configure:6038: result: $ac_cv_func_snprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
+ 
+ if test "$ac_cv_func_snprintf_working" = yes; then
+@@ -5739,13 +6048,13 @@
+ if test "$ac_cv_func_snprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
+-echo "configure:5202: checking if snprintf needs a prototype" >&5
++echo "configure:6051: checking if snprintf needs a prototype" >&5
+ echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5208 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6057 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5758,17 +6067,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5221: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6072: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_snprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_snprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5230: result: $ac_cv_func_snprintf_noproto" >&5
++echo "configure:6081: result: $ac_cv_func_snprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_snprintf_noproto" = yes; then
+@@ -5783,7 +6093,7 @@
+ 
+ fi
+ 
+-echo "configure:5240: checking for working vsnprintf" >&5
++echo "configure:6096: checking for working vsnprintf" >&5
+ echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5792,8 +6102,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5250 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6106 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5814,20 +6124,21 @@
+ {
+ 	return foo(0, "12");
+ }
+-EOF
+-if { (eval echo configure:5269: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:6129: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_vsnprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:5280: result: $ac_cv_func_vsnprintf_working" >&5
++echo "configure:6141: result: $ac_cv_func_vsnprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+@@ -5840,13 +6151,13 @@
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
+-echo "configure:5290: checking if vsnprintf needs a prototype" >&5
++echo "configure:6154: checking if vsnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5296 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6160 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -5859,17 +6170,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5309: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6175: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vsnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vsnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5318: result: $ac_cv_func_vsnprintf_noproto" >&5
++echo "configure:6184: result: $ac_cv_func_vsnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_noproto" = yes; then
+@@ -5884,14 +6196,14 @@
+ 
+ fi
+ 
+-echo "configure:5328: checking for working glob" >&5
++echo "configure:6199: checking for working glob" >&5
+ echo $ECHO_N "checking for working glob... $ECHO_C" >&6
+ if test "${ac_cv_func_glob_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_func_glob_working=yes
+-cat >conftest.$ac_ext <<EOF
+-#line 5335 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 6206 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -5905,17 +6217,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5347: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6222: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_glob_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5356: result: $ac_cv_func_glob_working" >&5
++echo "configure:6231: result: $ac_cv_func_glob_working" >&5
+ echo "${ECHO_T}$ac_cv_func_glob_working" >&6
+ 
+ if test "$ac_cv_func_glob_working" = yes; then
+@@ -5928,13 +6241,13 @@
+ if test "$ac_cv_func_glob_working" = yes; then
+ 
+ if test "$ac_cv_func_glob+set" != set -o "$ac_cv_func_glob" = yes; then
+-echo "configure:5366: checking if glob needs a prototype" >&5
++echo "configure:6244: checking if glob needs a prototype" >&5
+ echo $ECHO_N "checking if glob needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_glob_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5372 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6250 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <glob.h>
+@@ -5948,17 +6261,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5386: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6266: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_glob_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_glob_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5395: result: $ac_cv_func_glob_noproto" >&5
++echo "configure:6275: result: $ac_cv_func_glob_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_glob_noproto" >&6
+ 
+ if test "$ac_cv_func_glob_noproto" = yes; then
+@@ -6007,13 +6321,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5436: checking for $ac_func" >&5
++echo "configure:6324: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5442 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6330 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6042,17 +6356,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5470: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6361: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5479: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6370: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6066,7 +6381,7 @@
+ 	LIBOBJS="$LIBOBJS getcap.o"
+ fi
+ 
+-echo "configure:5490: checking for getsockopt" >&5
++echo "configure:6384: checking for getsockopt" >&5
+ echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6081,8 +6396,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5505 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 6400 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -6097,14 +6412,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5521: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6417: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6119,13 +6435,13 @@
+ for ac_func in getsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5539: checking for $ac_func" >&5
++echo "configure:6438: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5545 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6444 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6154,17 +6470,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5573: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6475: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5582: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6484: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6188,13 +6505,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5602: result: yes" >&5
++	echo "configure:6508: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getsockopt=no"
+ 	eval "LIB_getsockopt="
+-	echo "configure:5608: result: no" >&5
++	echo "configure:6514: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6208,12 +6525,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5620: result: yes, in $ac_res" >&5
++	echo "configure:6528: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:5624: checking for setsockopt" >&5
++echo "configure:6533: checking for setsockopt" >&5
+ echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_setsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6228,8 +6545,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5639 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 6549 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -6244,14 +6561,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5655: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6566: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6266,13 +6584,13 @@
+ for ac_func in setsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5673: checking for $ac_func" >&5
++echo "configure:6587: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5679 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6593 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6301,17 +6619,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5707: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6624: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5716: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6633: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6335,13 +6654,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5736: result: yes" >&5
++	echo "configure:6657: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_setsockopt=no"
+ 	eval "LIB_setsockopt="
+-	echo "configure:5742: result: no" >&5
++	echo "configure:6663: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6355,12 +6674,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5754: result: yes, in $ac_res" >&5
++	echo "configure:6677: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:5758: checking for hstrerror" >&5
++echo "configure:6682: checking for hstrerror" >&5
+ echo $ECHO_N "checking for hstrerror... $ECHO_C" >&6
+ if test "${ac_cv_funclib_hstrerror+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6375,8 +6694,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 5773 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 6698 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -6388,14 +6707,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5786: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6712: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_hstrerror=$ac_lib; else ac_cv_funclib_hstrerror=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_hstrerror=\${ac_cv_funclib_hstrerror-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6410,13 +6730,13 @@
+ for ac_func in hstrerror
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:5804: checking for $ac_func" >&5
++echo "configure:6733: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5810 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6739 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6445,17 +6765,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5838: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:6770: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:5847: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:6779: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6479,13 +6800,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:5867: result: yes" >&5
++	echo "configure:6803: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_hstrerror=no"
+ 	eval "LIB_hstrerror="
+-	echo "configure:5873: result: no" >&5
++	echo "configure:6809: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6499,7 +6820,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:5885: result: yes, in $ac_res" >&5
++	echo "configure:6823: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6515,13 +6836,13 @@
+ if test "$ac_cv_func_hstrerror" = yes; then
+ 
+ if test "$ac_cv_func_hstrerror+set" != set -o "$ac_cv_func_hstrerror" = yes; then
+-echo "configure:5897: checking if hstrerror needs a prototype" >&5
++echo "configure:6839: checking if hstrerror needs a prototype" >&5
+ echo $ECHO_N "checking if hstrerror needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_hstrerror_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5903 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6845 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_NETDB_H
+@@ -6537,17 +6858,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5918: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6863: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_hstrerror_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_hstrerror_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5927: result: $ac_cv_func_hstrerror_noproto" >&5
++echo "configure:6872: result: $ac_cv_func_hstrerror_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_hstrerror_noproto" >&6
+ 
+ if test "$ac_cv_func_hstrerror_noproto" = yes; then
+@@ -6565,13 +6887,13 @@
+ if test "$ac_cv_func_asprintf" = yes; then
+ 
+ if test "$ac_cv_func_asprintf+set" != set -o "$ac_cv_func_asprintf" = yes; then
+-echo "configure:5939: checking if asprintf needs a prototype" >&5
++echo "configure:6890: checking if asprintf needs a prototype" >&5
+ echo $ECHO_N "checking if asprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_asprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5945 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6896 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6586,17 +6908,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:5959: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6913: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_asprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_asprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:5968: result: $ac_cv_func_asprintf_noproto" >&5
++echo "configure:6922: result: $ac_cv_func_asprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_asprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_asprintf_noproto" = yes; then
+@@ -6612,13 +6935,13 @@
+ if test "$ac_cv_func_vasprintf" = yes; then
+ 
+ if test "$ac_cv_func_vasprintf+set" != set -o "$ac_cv_func_vasprintf" = yes; then
+-echo "configure:5980: checking if vasprintf needs a prototype" >&5
++echo "configure:6938: checking if vasprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vasprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vasprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 5986 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6944 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6633,17 +6956,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6000: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:6961: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vasprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vasprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6009: result: $ac_cv_func_vasprintf_noproto" >&5
++echo "configure:6970: result: $ac_cv_func_vasprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vasprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vasprintf_noproto" = yes; then
+@@ -6659,13 +6983,13 @@
+ if test "$ac_cv_func_asnprintf" = yes; then
+ 
+ if test "$ac_cv_func_asnprintf+set" != set -o "$ac_cv_func_asnprintf" = yes; then
+-echo "configure:6021: checking if asnprintf needs a prototype" >&5
++echo "configure:6986: checking if asnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if asnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_asnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6027 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 6992 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6680,17 +7004,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6041: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7009: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_asnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_asnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6050: result: $ac_cv_func_asnprintf_noproto" >&5
++echo "configure:7018: result: $ac_cv_func_asnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_asnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_asnprintf_noproto" = yes; then
+@@ -6706,13 +7031,13 @@
+ if test "$ac_cv_func_vasnprintf" = yes; then
+ 
+ if test "$ac_cv_func_vasnprintf+set" != set -o "$ac_cv_func_vasnprintf" = yes; then
+-echo "configure:6062: checking if vasnprintf needs a prototype" >&5
++echo "configure:7034: checking if vasnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vasnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vasnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6068 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7040 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6727,17 +7052,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6082: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7057: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vasnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vasnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6091: result: $ac_cv_func_vasnprintf_noproto" >&5
++echo "configure:7066: result: $ac_cv_func_vasnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vasnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vasnprintf_noproto" = yes; then
+@@ -6751,7 +7077,7 @@
+ fi
+ fi
+ 
+-echo "configure:6101: checking for pidfile" >&5
++echo "configure:7080: checking for pidfile" >&5
+ echo $ECHO_N "checking for pidfile... $ECHO_C" >&6
+ if test "${ac_cv_funclib_pidfile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6766,8 +7092,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 6116 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 7096 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_UTIL_H
+ #include <util.h>
+@@ -6779,14 +7105,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6129: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7110: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_pidfile=$ac_lib; else ac_cv_funclib_pidfile=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_pidfile=\${ac_cv_funclib_pidfile-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -6801,13 +7128,13 @@
+ for ac_func in pidfile
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6147: checking for $ac_func" >&5
++echo "configure:7131: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6153 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7137 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6836,17 +7163,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6181: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7168: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6190: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7177: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6870,13 +7198,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:6210: result: yes" >&5
++	echo "configure:7201: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_pidfile=no"
+ 	eval "LIB_pidfile="
+-	echo "configure:6216: result: no" >&5
++	echo "configure:7207: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6890,7 +7218,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:6228: result: yes, in $ac_res" >&5
++	echo "configure:7221: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6967,13 +7295,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6303: checking for $ac_func" >&5
++echo "configure:7298: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6309 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7304 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7002,17 +7330,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6337: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7335: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6346: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7344: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+ 
+@@ -7100,13 +7429,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6429: checking for $ac_func" >&5
++echo "configure:7432: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6435 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7438 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7135,17 +7464,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6463: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7469: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6472: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7478: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7158,7 +7488,7 @@
+ fi
+ done
+ 
+-echo "configure:6482: checking if getnameinfo is broken" >&5
++echo "configure:7491: checking if getnameinfo is broken" >&5
+ echo $ECHO_N "checking if getnameinfo is broken... $ECHO_C" >&6
+ if test "${ac_cv_func_getnameinfo_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7166,8 +7496,8 @@
+   if test "$cross_compiling" = yes; then
+   { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6491 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7500 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -7191,33 +7521,34 @@
+ 	      NULL, 0, 0);
+ }
+ 
+-EOF
+-if { (eval echo configure:6514: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:7526: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   ac_cv_func_getnameinfo_broken=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getnameinfo_broken=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:6525: result: $ac_cv_func_getnameinfo_broken" >&5
++echo "configure:7538: result: $ac_cv_func_getnameinfo_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_getnameinfo_broken" >&6
+ if test "$ac_cv_func_getnameinfo_broken" = yes; then
+ 	LIBOBJS="$LIBOBJS getnameinfo.o"
+ fi
+ 
+ if test "$ac_cv_func_setenv+set" != set -o "$ac_cv_func_setenv" = yes; then
+-echo "configure:6531: checking if setenv needs a prototype" >&5
++echo "configure:7545: checking if setenv needs a prototype" >&5
+ echo $ECHO_N "checking if setenv needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_setenv_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6537 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7551 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -7230,17 +7561,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6550: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7566: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_setenv_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_setenv_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6559: result: $ac_cv_func_setenv_noproto" >&5
++echo "configure:7575: result: $ac_cv_func_setenv_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_setenv_noproto" >&6
+ 
+ if test "$ac_cv_func_setenv_noproto" = yes; then
+@@ -7254,13 +7586,13 @@
+ fi
+ 
+ if test "$ac_cv_func_unsetenv+set" != set -o "$ac_cv_func_unsetenv" = yes; then
+-echo "configure:6569: checking if unsetenv needs a prototype" >&5
++echo "configure:7589: checking if unsetenv needs a prototype" >&5
+ echo $ECHO_N "checking if unsetenv needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_unsetenv_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6575 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7595 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -7273,17 +7605,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6588: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7610: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_unsetenv_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_unsetenv_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6597: result: $ac_cv_func_unsetenv_noproto" >&5
++echo "configure:7619: result: $ac_cv_func_unsetenv_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_unsetenv_noproto" >&6
+ 
+ if test "$ac_cv_func_unsetenv_noproto" = yes; then
+@@ -7297,13 +7630,13 @@
+ fi
+ 
+ if test "$ac_cv_func_gethostname+set" != set -o "$ac_cv_func_gethostname" = yes; then
+-echo "configure:6607: checking if gethostname needs a prototype" >&5
++echo "configure:7633: checking if gethostname needs a prototype" >&5
+ echo $ECHO_N "checking if gethostname needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostname_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6613 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7639 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -7316,17 +7649,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6626: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7654: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostname_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_gethostname_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6635: result: $ac_cv_func_gethostname_noproto" >&5
++echo "configure:7663: result: $ac_cv_func_gethostname_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostname_noproto" >&6
+ 
+ if test "$ac_cv_func_gethostname_noproto" = yes; then
+@@ -7340,13 +7674,13 @@
+ fi
+ 
+ if test "$ac_cv_func_mkstemp+set" != set -o "$ac_cv_func_mkstemp" = yes; then
+-echo "configure:6645: checking if mkstemp needs a prototype" >&5
++echo "configure:7677: checking if mkstemp needs a prototype" >&5
+ echo $ECHO_N "checking if mkstemp needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6651 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7683 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -7359,17 +7693,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6664: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7698: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_mkstemp_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_mkstemp_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6673: result: $ac_cv_func_mkstemp_noproto" >&5
++echo "configure:7707: result: $ac_cv_func_mkstemp_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp_noproto" >&6
+ 
+ if test "$ac_cv_func_mkstemp_noproto" = yes; then
+@@ -7383,13 +7718,13 @@
+ fi
+ 
+ if test "$ac_cv_func_getusershell+set" != set -o "$ac_cv_func_getusershell" = yes; then
+-echo "configure:6683: checking if getusershell needs a prototype" >&5
++echo "configure:7721: checking if getusershell needs a prototype" >&5
+ echo $ECHO_N "checking if getusershell needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getusershell_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6689 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7727 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -7402,17 +7737,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6702: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7742: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getusershell_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_getusershell_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6711: result: $ac_cv_func_getusershell_noproto" >&5
++echo "configure:7751: result: $ac_cv_func_getusershell_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_getusershell_noproto" >&6
+ 
+ if test "$ac_cv_func_getusershell_noproto" = yes; then
+@@ -7426,13 +7762,13 @@
+ fi
+ 
+ if test "$ac_cv_func_inet_aton+set" != set -o "$ac_cv_func_inet_aton" = yes; then
+-echo "configure:6721: checking if inet_aton needs a prototype" >&5
++echo "configure:7765: checking if inet_aton needs a prototype" >&5
+ echo $ECHO_N "checking if inet_aton needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_inet_aton_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6727 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7771 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7457,17 +7793,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6751: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7798: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_inet_aton_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_inet_aton_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6760: result: $ac_cv_func_inet_aton_noproto" >&5
++echo "configure:7807: result: $ac_cv_func_inet_aton_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_inet_aton_noproto" >&6
+ 
+ if test "$ac_cv_func_inet_aton_noproto" = yes; then
+@@ -7480,7 +7817,7 @@
+ 
+ fi
+ 
+-echo "configure:6769: checking for crypt" >&5
++echo "configure:7820: checking for crypt" >&5
+ echo $ECHO_N "checking for crypt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7495,8 +7832,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 6784 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 7836 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -7506,14 +7843,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6794: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7848: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_crypt=\${ac_cv_funclib_crypt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -7528,13 +7866,13 @@
+ for ac_func in crypt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:6812: checking for $ac_func" >&5
++echo "configure:7869: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6818 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7875 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7563,17 +7901,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6846: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:7906: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:6855: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7915: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7597,13 +7936,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:6875: result: yes" >&5
++	echo "configure:7939: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_crypt=no"
+ 	eval "LIB_crypt="
+-	echo "configure:6881: result: no" >&5
++	echo "configure:7945: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -7617,18 +7956,18 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:6893: result: yes, in $ac_res" >&5
++	echo "configure:7959: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:6897: checking if gethostbyname is compatible with system prototype" >&5
++echo "configure:7964: checking if gethostbyname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if gethostbyname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6903 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 7970 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7654,17 +7993,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6928: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:7998: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostbyname_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_gethostbyname_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6937: result: $ac_cv_func_gethostbyname_proto_compat" >&5
++echo "configure:8007: result: $ac_cv_func_gethostbyname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_gethostbyname_proto_compat" = yes; then
+@@ -7675,13 +8015,13 @@
+ 
+ fi
+ 
+-echo "configure:6945: checking if gethostbyaddr is compatible with system prototype" >&5
++echo "configure:8018: checking if gethostbyaddr is compatible with system prototype" >&5
+ echo $ECHO_N "checking if gethostbyaddr is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyaddr_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6951 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8024 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7707,17 +8047,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:6976: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8052: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostbyaddr_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_gethostbyaddr_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:6985: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
++echo "configure:8061: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyaddr_proto_compat" >&6
+ 
+ if test "$ac_cv_func_gethostbyaddr_proto_compat" = yes; then
+@@ -7728,13 +8069,13 @@
+ 
+ fi
+ 
+-echo "configure:6993: checking if getservbyname is compatible with system prototype" >&5
++echo "configure:8072: checking if getservbyname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if getservbyname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getservbyname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 6999 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8078 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7760,17 +8101,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7024: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8106: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getservbyname_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_getservbyname_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7033: result: $ac_cv_func_getservbyname_proto_compat" >&5
++echo "configure:8115: result: $ac_cv_func_getservbyname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_getservbyname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_getservbyname_proto_compat" = yes; then
+@@ -7781,13 +8123,13 @@
+ 
+ fi
+ 
+-echo "configure:7041: checking if getsockname is compatible with system prototype" >&5
++echo "configure:8126: checking if getsockname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if getsockname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getsockname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7047 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8132 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -7804,17 +8146,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7063: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8151: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getsockname_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_getsockname_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7072: result: $ac_cv_func_getsockname_proto_compat" >&5
++echo "configure:8160: result: $ac_cv_func_getsockname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_getsockname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_getsockname_proto_compat" = yes; then
+@@ -7825,13 +8168,13 @@
+ 
+ fi
+ 
+-echo "configure:7080: checking if openlog is compatible with system prototype" >&5
++echo "configure:8171: checking if openlog is compatible with system prototype" >&5
+ echo $ECHO_N "checking if openlog is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_openlog_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7086 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8177 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYSLOG_H
+@@ -7845,17 +8188,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7099: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8193: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_openlog_proto_compat=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_openlog_proto_compat=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7108: result: $ac_cv_func_openlog_proto_compat" >&5
++echo "configure:8202: result: $ac_cv_func_openlog_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_openlog_proto_compat" >&6
+ 
+ if test "$ac_cv_func_openlog_proto_compat" = yes; then
+@@ -7867,13 +8211,13 @@
+ fi
+ 
+ if test "$ac_cv_func_crypt+set" != set -o "$ac_cv_func_crypt" = yes; then
+-echo "configure:7117: checking if crypt needs a prototype" >&5
++echo "configure:8214: checking if crypt needs a prototype" >&5
+ echo $ECHO_N "checking if crypt needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_crypt_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7123 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8220 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_CRYPT_H
+@@ -7893,17 +8237,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7141: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8242: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_crypt_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_crypt_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7150: result: $ac_cv_func_crypt_noproto" >&5
++echo "configure:8251: result: $ac_cv_func_crypt_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_crypt_noproto" >&6
+ 
+ if test "$ac_cv_func_crypt_noproto" = yes; then
+@@ -7917,13 +8262,13 @@
+ fi
+ 
+ if test "$ac_cv_func_strtok_r+set" != set -o "$ac_cv_func_strtok_r" = yes; then
+-echo "configure:7160: checking if strtok_r needs a prototype" >&5
++echo "configure:8265: checking if strtok_r needs a prototype" >&5
+ echo $ECHO_N "checking if strtok_r needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_strtok_r_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7166 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8271 "configure"
+ #include "confdefs.h"
+ 
+ #include <string.h>
+@@ -7938,17 +8283,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7179: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8288: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_strtok_r_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_strtok_r_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7188: result: $ac_cv_func_strtok_r_noproto" >&5
++echo "configure:8297: result: $ac_cv_func_strtok_r_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_strtok_r_noproto" >&6
+ 
+ if test "$ac_cv_func_strtok_r_noproto" = yes; then
+@@ -7962,13 +8308,13 @@
+ fi
+ 
+ if test "$ac_cv_func_strsep+set" != set -o "$ac_cv_func_strsep" = yes; then
+-echo "configure:7198: checking if strsep needs a prototype" >&5
++echo "configure:8311: checking if strsep needs a prototype" >&5
+ echo $ECHO_N "checking if strsep needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_strsep_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7204 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 8317 "configure"
+ #include "confdefs.h"
+ 
+ #include <string.h>
+@@ -7983,17 +8329,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7217: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8334: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_strsep_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_strsep_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7226: result: $ac_cv_func_strsep_noproto" >&5
++echo "configure:8343: result: $ac_cv_func_strsep_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_strsep_noproto" >&6
+ 
+ if test "$ac_cv_func_strsep_noproto" = yes; then
+@@ -8006,14 +8353,14 @@
+ 
+ fi
+ 
+-echo "configure:7235: checking for h_errno" >&5
++echo "configure:8356: checking for h_errno" >&5
+ echo $ECHO_N "checking for h_errno... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7241 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8363 "configure"
+ #include "confdefs.h"
+ extern int h_errno;
+ int foo() { return h_errno; }
+@@ -8024,20 +8371,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7253: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8376: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_errno=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_h_errno=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_errno`
+-echo "configure:7263: result: $ac_foo" >&5
++echo "configure:8388: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8046,14 +8394,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7271: checking if h_errno is properly declared" >&5
++echo "configure:8397: checking if h_errno is properly declared" >&5
+ echo $ECHO_N "checking if h_errno is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errno_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7277 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8404 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -8069,19 +8417,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7294: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8422: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_h_errno_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_h_errno_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7303: result: $ac_cv_var_h_errno_declaration" >&5
++echo "configure:8433: result: $ac_cv_var_h_errno_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_h_errno_declaration" >&6
+ if eval "test \"\$ac_cv_var_h_errno_declaration\" = yes"; then
+ 	
+@@ -8093,14 +8442,14 @@
+ 
+ fi
+ 
+-echo "configure:7312: checking for h_errlist" >&5
++echo "configure:8445: checking for h_errlist" >&5
+ echo $ECHO_N "checking for h_errlist... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errlist+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7318 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8452 "configure"
+ #include "confdefs.h"
+ extern int h_errlist;
+ int foo() { return h_errlist; }
+@@ -8111,20 +8460,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7330: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8465: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_errlist=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_h_errlist=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_errlist`
+-echo "configure:7340: result: $ac_foo" >&5
++echo "configure:8477: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8133,14 +8483,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7348: checking if h_errlist is properly declared" >&5
++echo "configure:8486: checking if h_errlist is properly declared" >&5
+ echo $ECHO_N "checking if h_errlist is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errlist_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7354 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8493 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -8153,19 +8503,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7368: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8508: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_h_errlist_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_h_errlist_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7377: result: $ac_cv_var_h_errlist_declaration" >&5
++echo "configure:8519: result: $ac_cv_var_h_errlist_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_h_errlist_declaration" >&6
+ if eval "test \"\$ac_cv_var_h_errlist_declaration\" = yes"; then
+ 	
+@@ -8177,14 +8528,14 @@
+ 
+ fi
+ 
+-echo "configure:7386: checking for h_nerr" >&5
++echo "configure:8531: checking for h_nerr" >&5
+ echo $ECHO_N "checking for h_nerr... $ECHO_C" >&6
+ if test "${ac_cv_var_h_nerr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7392 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8538 "configure"
+ #include "confdefs.h"
+ extern int h_nerr;
+ int foo() { return h_nerr; }
+@@ -8195,20 +8546,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7404: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8551: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_nerr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_h_nerr=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_nerr`
+-echo "configure:7414: result: $ac_foo" >&5
++echo "configure:8563: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8217,14 +8569,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7422: checking if h_nerr is properly declared" >&5
++echo "configure:8572: checking if h_nerr is properly declared" >&5
+ echo $ECHO_N "checking if h_nerr is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_h_nerr_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7428 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8579 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -8237,19 +8589,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7442: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8594: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_h_nerr_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_h_nerr_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7451: result: $ac_cv_var_h_nerr_declaration" >&5
++echo "configure:8605: result: $ac_cv_var_h_nerr_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_h_nerr_declaration" >&6
+ if eval "test \"\$ac_cv_var_h_nerr_declaration\" = yes"; then
+ 	
+@@ -8261,14 +8614,14 @@
+ 
+ fi
+ 
+-echo "configure:7460: checking for __progname" >&5
++echo "configure:8617: checking for __progname" >&5
+ echo $ECHO_N "checking for __progname... $ECHO_C" >&6
+ if test "${ac_cv_var___progname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7466 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8624 "configure"
+ #include "confdefs.h"
+ extern int __progname;
+ int foo() { return __progname; }
+@@ -8279,20 +8632,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7478: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:8637: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var___progname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var___progname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var___progname`
+-echo "configure:7488: result: $ac_foo" >&5
++echo "configure:8649: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8301,14 +8655,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7496: checking if __progname is properly declared" >&5
++echo "configure:8658: checking if __progname is properly declared" >&5
+ echo $ECHO_N "checking if __progname is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var___progname_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7502 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8665 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_ERR_H
+ #include <err.h>
+@@ -8321,19 +8675,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7516: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8680: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var___progname_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var___progname_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7525: result: $ac_cv_var___progname_declaration" >&5
++echo "configure:8691: result: $ac_cv_var___progname_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var___progname_declaration" >&6
+ if eval "test \"\$ac_cv_var___progname_declaration\" = yes"; then
+ 	
+@@ -8345,14 +8700,14 @@
+ 
+ fi
+ 
+-echo "configure:7534: checking if optarg is properly declared" >&5
++echo "configure:8703: checking if optarg is properly declared" >&5
+ echo $ECHO_N "checking if optarg is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optarg_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7540 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8710 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8366,19 +8721,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7555: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8726: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optarg_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_optarg_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7564: result: $ac_cv_var_optarg_declaration" >&5
++echo "configure:8737: result: $ac_cv_var_optarg_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optarg_declaration" >&6
+ if eval "test \"\$ac_cv_var_optarg_declaration\" = yes"; then
+ 	
+@@ -8388,14 +8744,14 @@
+ 
+ fi
+ 
+-echo "configure:7572: checking if optind is properly declared" >&5
++echo "configure:8747: checking if optind is properly declared" >&5
+ echo $ECHO_N "checking if optind is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optind_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7578 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8754 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8409,19 +8765,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7593: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8770: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optind_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_optind_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7602: result: $ac_cv_var_optind_declaration" >&5
++echo "configure:8781: result: $ac_cv_var_optind_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optind_declaration" >&6
+ if eval "test \"\$ac_cv_var_optind_declaration\" = yes"; then
+ 	
+@@ -8431,14 +8788,14 @@
+ 
+ fi
+ 
+-echo "configure:7610: checking if opterr is properly declared" >&5
++echo "configure:8791: checking if opterr is properly declared" >&5
+ echo $ECHO_N "checking if opterr is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_opterr_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7616 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8798 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8452,19 +8809,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7631: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8814: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_opterr_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_opterr_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7640: result: $ac_cv_var_opterr_declaration" >&5
++echo "configure:8825: result: $ac_cv_var_opterr_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_opterr_declaration" >&6
+ if eval "test \"\$ac_cv_var_opterr_declaration\" = yes"; then
+ 	
+@@ -8474,14 +8832,14 @@
+ 
+ fi
+ 
+-echo "configure:7648: checking if optopt is properly declared" >&5
++echo "configure:8835: checking if optopt is properly declared" >&5
+ echo $ECHO_N "checking if optopt is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optopt_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7654 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8842 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -8495,19 +8853,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7669: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8858: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optopt_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_optopt_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7678: result: $ac_cv_var_optopt_declaration" >&5
++echo "configure:8869: result: $ac_cv_var_optopt_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optopt_declaration" >&6
+ if eval "test \"\$ac_cv_var_optopt_declaration\" = yes"; then
+ 	
+@@ -8517,14 +8876,14 @@
+ 
+ fi
+ 
+-echo "configure:7686: checking if environ is properly declared" >&5
++echo "configure:8879: checking if environ is properly declared" >&5
+ echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_environ_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7692 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8886 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ extern struct { int foo; } environ;
+@@ -8535,19 +8894,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7704: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8899: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_environ_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_environ_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7713: result: $ac_cv_var_environ_declaration" >&5
++echo "configure:8910: result: $ac_cv_var_environ_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_environ_declaration" >&6
+ if eval "test \"\$ac_cv_var_environ_declaration\" = yes"; then
+ 	
+@@ -8557,14 +8917,14 @@
+ 
+ fi
+ 
+-echo "configure:7721: checking for tm_gmtoff in struct tm" >&5
++echo "configure:8920: checking for tm_gmtoff in struct tm" >&5
+ echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7727 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8927 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -8574,17 +8934,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7738: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8939: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_gmtoff=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_gmtoff=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7747: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
++echo "configure:8948: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
+ if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
+ 	
+@@ -8596,14 +8957,14 @@
+ 	
+ fi
+ 
+-echo "configure:7757: checking for tm_zone in struct tm" >&5
++echo "configure:8960: checking for tm_zone in struct tm" >&5
+ echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7763 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 8967 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -8613,17 +8974,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7774: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:8979: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_zone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_zone=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7783: result: $ac_cv_type_struct_tm_tm_zone" >&5
++echo "configure:8988: result: $ac_cv_type_struct_tm_tm_zone" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
+ if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
+ 	
+@@ -8635,14 +8997,14 @@
+ 	
+ fi
+ 
+-echo "configure:7793: checking for timezone" >&5
++echo "configure:9000: checking for timezone" >&5
+ echo $ECHO_N "checking for timezone... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7799 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9007 "configure"
+ #include "confdefs.h"
+ extern int timezone;
+ int foo() { return timezone; }
+@@ -8653,20 +9015,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7811: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:9020: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_timezone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_timezone=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_timezone`
+-echo "configure:7821: result: $ac_foo" >&5
++echo "configure:9032: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -8675,14 +9038,14 @@
+ EOF
+ 
+ 	
+-echo "configure:7829: checking if timezone is properly declared" >&5
++echo "configure:9041: checking if timezone is properly declared" >&5
+ echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 7835 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9048 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ extern struct { int foo; } timezone;
+@@ -8693,19 +9056,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7847: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9061: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_timezone_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_timezone_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:7856: result: $ac_cv_var_timezone_declaration" >&5
++echo "configure:9072: result: $ac_cv_var_timezone_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
+ if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
+ 	
+@@ -8718,13 +9082,13 @@
+ fi
+ 
+ cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
+-echo "configure:7866: checking for sa_family_t" >&5
++echo "configure:9085: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7872 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9091 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8739,29 +9103,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7888: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9108: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:7898: result: $ac_foo" >&5
++echo "configure:9118: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:7903: checking for sa_family_t" >&5
++	echo "configure:9123: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sa_family_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7909 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9129 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8774,17 +9139,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7923: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9144: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_sa_family_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_sa_family_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:7932: result: $ac_cv_type_sa_family_t" >&5
++echo "configure:9153: result: $ac_cv_type_sa_family_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
+ if test $ac_cv_type_sa_family_t = yes; then
+ 
+@@ -8803,13 +9169,13 @@
+ fi
+ 
+ cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
+-echo "configure:7945: checking for socklen_t" >&5
++echo "configure:9172: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7951 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9178 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8824,29 +9190,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:7967: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9195: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:7977: result: $ac_foo" >&5
++echo "configure:9205: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:7982: checking for socklen_t" >&5
++	echo "configure:9210: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if test "${ac_cv_type_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 7988 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9216 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8859,17 +9226,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8002: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9231: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_socklen_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_socklen_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8011: result: $ac_cv_type_socklen_t" >&5
++echo "configure:9240: result: $ac_cv_type_socklen_t" >&5
+ echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+ if test $ac_cv_type_socklen_t = yes; then
+ 
+@@ -8888,13 +9256,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+-echo "configure:8024: checking for struct sockaddr" >&5
++echo "configure:9259: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8030 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9265 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8909,29 +9277,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8046: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9282: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:8056: result: $ac_foo" >&5
++echo "configure:9292: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:8061: checking for struct sockaddr" >&5
++	echo "configure:9297: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8067 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9303 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -8944,17 +9313,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8081: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9318: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8090: result: $ac_cv_type_struct_sockaddr" >&5
++echo "configure:9327: result: $ac_cv_type_struct_sockaddr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
+ if test $ac_cv_type_struct_sockaddr = yes; then
+ 
+@@ -8973,13 +9343,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-echo "configure:8103: checking for struct sockaddr_storage" >&5
++echo "configure:9346: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8109 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9352 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -8994,29 +9364,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8125: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9369: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:8135: result: $ac_foo" >&5
++echo "configure:9379: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:8140: checking for struct sockaddr_storage" >&5
++	echo "configure:9384: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8146 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9390 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9029,17 +9400,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8160: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9405: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_storage=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_storage=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8169: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "configure:9414: result: $ac_cv_type_struct_sockaddr_storage" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
+ if test $ac_cv_type_struct_sockaddr_storage = yes; then
+ 
+@@ -9058,13 +9430,13 @@
+ fi
+ 
+ cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-echo "configure:8182: checking for struct addrinfo" >&5
++echo "configure:9433: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8188 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9439 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -9079,29 +9451,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8204: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9456: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:8214: result: $ac_foo" >&5
++echo "configure:9466: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:8219: checking for struct addrinfo" >&5
++	echo "configure:9471: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_addrinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8225 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9477 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9114,17 +9487,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8239: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9492: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_addrinfo=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_addrinfo=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8248: result: $ac_cv_type_struct_addrinfo" >&5
++echo "configure:9501: result: $ac_cv_type_struct_addrinfo" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
+ if test $ac_cv_type_struct_addrinfo = yes; then
+ 
+@@ -9143,13 +9517,13 @@
+ fi
+ 
+ cv=`echo "struct ifaddrs" | sed 'y%./+- %__p__%'`
+-echo "configure:8261: checking for struct ifaddrs" >&5
++echo "configure:9520: checking for struct ifaddrs" >&5
+ echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8267 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9526 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -9164,29 +9538,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8283: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9543: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:8293: result: $ac_foo" >&5
++echo "configure:9553: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct ifaddrs | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:8298: checking for struct ifaddrs" >&5
++	echo "configure:9558: checking for struct ifaddrs" >&5
+ echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_ifaddrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8304 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 9564 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -9199,17 +9574,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8318: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9579: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_ifaddrs=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_ifaddrs=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8327: result: $ac_cv_type_struct_ifaddrs" >&5
++echo "configure:9588: result: $ac_cv_type_struct_ifaddrs" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_ifaddrs" >&6
+ if test $ac_cv_type_struct_ifaddrs = yes; then
+ 
+@@ -9227,7 +9603,7 @@
+ 
+ fi
+ 
+-echo "configure:8339: checking for struct winsize" >&5
++echo "configure:9606: checking for struct winsize" >&5
+ echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
+ if test "${ac_cv_struct_winsize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9235,12 +9611,12 @@
+ 
+ ac_cv_struct_winsize=no
+ for i in sys/termios.h sys/ioctl.h; do
+-cat >conftest.$ac_ext <<EOF
+-#line 8347 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9615 "configure"
+ #include "confdefs.h"
+ #include <$i>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "struct[ 	]*winsize" >/dev/null 2>&1; then
+   ac_cv_struct_winsize=yes; break
+@@ -9257,14 +9633,14 @@
+ EOF
+ 
+ fi
+-echo "configure:8363: result: $ac_cv_struct_winsize" >&5
++echo "configure:9636: result: $ac_cv_struct_winsize" >&5
+ echo "${ECHO_T}$ac_cv_struct_winsize" >&6
+-cat >conftest.$ac_ext <<EOF
+-#line 8366 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9639 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_xpixel" >/dev/null 2>&1; then
+ 
+@@ -9275,12 +9651,12 @@
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 8378 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9655 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_ypixel" >/dev/null 2>&1; then
+ 
+@@ -9291,14 +9667,14 @@
+ fi
+ rm -f conftest*
+ 
+-echo "configure:8389: checking for struct spwd" >&5
++echo "configure:9670: checking for struct spwd" >&5
+ echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
+ if test "${ac_cv_struct_spwd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 8395 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9677 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ #ifdef HAVE_SHADOW_H
+@@ -9311,19 +9687,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8409: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9692: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_spwd=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_struct_spwd=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:8418: result: $ac_cv_struct_spwd" >&5
++echo "configure:9703: result: $ac_cv_struct_spwd" >&5
+ echo "${ECHO_T}$ac_cv_struct_spwd" >&6
+ 
+ if test "$ac_cv_struct_spwd" = "yes"; then
+@@ -9334,14 +9711,14 @@
+ 
+ fi
+ 
+-echo "configure:8425: checking for sa_len in struct sockaddr" >&5
++echo "configure:9714: checking for sa_len in struct sockaddr" >&5
+ echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 8431 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 9721 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -9352,17 +9729,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8443: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9734: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_sa_len=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_sa_len=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:8452: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
++echo "configure:9743: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
+ if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
+ 	
+@@ -9382,7 +9760,8 @@
+ if test "${with_openldap+set}" = set; then
+   withval="$with_openldap"
+ 
+-fi
++fi;
++
+ # Check whether --with-openldap-lib or --without-openldap-lib was given.
+ if test "${with_openldap_lib+set}" = set; then
+   withval="$with_openldap_lib"
+@@ -9391,7 +9770,8 @@
+ elif test "X$with_openldap" = "X"; then
+   with_openldap=yes
+ fi
+-fi
++fi;
++
+ # Check whether --with-openldap-include or --without-openldap-include was given.
+ if test "${with_openldap_include+set}" = set; then
+   withval="$with_openldap_include"
+@@ -9400,9 +9780,9 @@
+ elif test "X$with_openldap" = "X"; then
+   with_openldap=yes
+ fi
+-fi
++fi;
+ 
+-echo "configure:8486: checking for openldap" >&5
++echo "configure:9785: checking for openldap" >&5
+ echo $ECHO_N "checking for openldap... $ECHO_C" >&6
+ 
+ case "$with_openldap" in
+@@ -9420,7 +9800,7 @@
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -9441,8 +9821,8 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8523 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9825 "configure"
+ #include "confdefs.h"
+ #include <ldap.h>
+ int
+@@ -9452,19 +9832,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8533: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9837: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lldap -llber  $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8544 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9848 "configure"
+ #include "confdefs.h"
+ #include <ldap.h>
+ int
+@@ -9474,14 +9855,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8554: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:9860: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+@@ -9489,6 +9871,7 @@
+ if test "$ires" -a "$lres" -a "$with_openldap" != "no"; then
+ 	openldap_includedir="$ires"
+ 	openldap_libdir="$lres"
++	DIR_openldap=
+ 	INCLUDE_openldap="-I$openldap_includedir"
+ 	LIB_openldap="-L$openldap_libdir -lldap -llber"
+ 	
+@@ -9497,13 +9880,14 @@
+ EOF
+ 
+ 	with_openldap=yes
+-	echo "configure:8574: result: headers $ires, libraries $lres" >&5
++	echo "configure:9883: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_openldap="openldap"
+ 	INCLUDE_openldap=
+ 	LIB_openldap=
+ 	with_openldap=no
+-	echo "configure:8580: result: $with_openldap" >&5
++	echo "configure:9890: result: $with_openldap" >&5
+ echo "${ECHO_T}$with_openldap" >&6
+ fi
+ 
+@@ -9515,7 +9899,8 @@
+ if test "${with_krb4+set}" = set; then
+   withval="$with_krb4"
+ 
+-fi
++fi;
++
+ # Check whether --with-krb4-lib or --without-krb4-lib was given.
+ if test "${with_krb4_lib+set}" = set; then
+   withval="$with_krb4_lib"
+@@ -9524,7 +9909,8 @@
+ elif test "X$with_krb4" = "X"; then
+   with_krb4=yes
+ fi
+-fi
++fi;
++
+ # Check whether --with-krb4-include or --without-krb4-include was given.
+ if test "${with_krb4_include+set}" = set; then
+   withval="$with_krb4_include"
+@@ -9533,9 +9919,9 @@
+ elif test "X$with_krb4" = "X"; then
+   with_krb4=yes
+ fi
+-fi
++fi;
+ 
+-echo "configure:8608: checking for krb4" >&5
++echo "configure:9924: checking for krb4" >&5
+ echo $ECHO_N "checking for krb4... $ECHO_C" >&6
+ 
+ case "$with_krb4" in
+@@ -9553,7 +9939,7 @@
+ header_dirs=
+ lib_dirs=
+ d='/usr/athena'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -9574,8 +9960,8 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8645 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9964 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9585,19 +9971,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8655: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:9976: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lkrb -ldes $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 8666 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 9987 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9607,14 +9994,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8676: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:9999: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+@@ -9622,6 +10010,7 @@
+ if test "$ires" -a "$lres" -a "$with_krb4" != "no"; then
+ 	krb4_includedir="$ires"
+ 	krb4_libdir="$lres"
++	DIR_krb4=
+ 	INCLUDE_krb4="-I$krb4_includedir"
+ 	LIB_krb4="-L$krb4_libdir -lkrb"
+ 	
+@@ -9630,13 +10019,14 @@
+ EOF
+ 
+ 	with_krb4=yes
+-	echo "configure:8696: result: headers $ires, libraries $lres" >&5
++	echo "configure:10022: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_krb4="krb4"
+ 	INCLUDE_krb4=
+ 	LIB_krb4=
+ 	with_krb4=no
+-	echo "configure:8702: result: $with_krb4" >&5
++	echo "configure:10029: result: $with_krb4" >&5
+ echo "${ECHO_T}$with_krb4" >&6
+ fi
+ 
+@@ -9648,13 +10038,13 @@
+ 	LIBS="$LIB_krb4 -ldes $LIBS"
+ 	EXTRA_LIB45=lib45.a
+ 	
+-	echo "configure:8713: checking for four valued krb_put_int" >&5
++	echo "configure:10041: checking for four valued krb_put_int" >&5
+ echo $ECHO_N "checking for four valued krb_put_int... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_put_int_four+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8719 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10047 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9666,18 +10056,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8731: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10061: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_put_int_four=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_put_int_four=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:8741: result: $ac_cv_func_krb_put_int_four" >&5
++echo "configure:10071: result: $ac_cv_func_krb_put_int_four" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_put_int_four" >&6
+ 	if test "$ac_cv_func_krb_put_int_four" = yes; then
+ 		
+@@ -9688,13 +10079,13 @@
+ 	fi
+ 	
+ 
+-	echo "configure:8750: checking for KRB_VERIFY_SECURE" >&5
++	echo "configure:10082: checking for KRB_VERIFY_SECURE" >&5
+ echo $ECHO_N "checking for KRB_VERIFY_SECURE... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_verify_secure+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8756 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10088 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9705,18 +10096,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8767: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10101: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_verify_secure=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_verify_secure=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:8777: result: $ac_cv_func_krb_verify_secure" >&5
++echo "configure:10111: result: $ac_cv_func_krb_verify_secure" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_verify_secure" >&6
+ 	if test "$ac_cv_func_krb_verify_secure" != yes; then
+ 		
+@@ -9730,13 +10122,13 @@
+ EOF
+ 
+ 	fi
+-	echo "configure:8789: checking for KRB_VERIFY_NOT_SECURE" >&5
++	echo "configure:10125: checking for KRB_VERIFY_NOT_SECURE" >&5
+ echo $ECHO_N "checking for KRB_VERIFY_NOT_SECURE... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_verify_not_secure+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8795 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10131 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -9747,18 +10139,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8806: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10144: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_verify_not_secure=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_verify_not_secure=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:8816: result: $ac_cv_func_krb_verify_not_secure" >&5
++echo "configure:10154: result: $ac_cv_func_krb_verify_not_secure" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_verify_not_secure" >&6
+ 	if test "$ac_cv_func_krb_verify_not_secure" != yes; then
+ 		
+@@ -9769,7 +10162,7 @@
+ 	fi
+ 	
+ 
+-echo "configure:8825: checking for krb_enable_debug" >&5
++echo "configure:10165: checking for krb_enable_debug" >&5
+ echo $ECHO_N "checking for krb_enable_debug... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_enable_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9784,8 +10177,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 8840 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 10181 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9795,14 +10188,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8850: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10193: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_enable_debug=$ac_lib; else ac_cv_funclib_krb_enable_debug=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_krb_enable_debug=\${ac_cv_funclib_krb_enable_debug-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -9817,13 +10211,13 @@
+ for ac_func in krb_enable_debug
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:8868: checking for $ac_func" >&5
++echo "configure:10214: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 8874 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10220 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -9852,17 +10246,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8902: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10251: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:8911: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10260: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -9886,13 +10281,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:8931: result: yes" >&5
++	echo "configure:10284: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_enable_debug=no"
+ 	eval "LIB_krb_enable_debug="
+-	echo "configure:8937: result: no" >&5
++	echo "configure:10290: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -9906,7 +10301,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:8949: result: yes, in $ac_res" >&5
++	echo "configure:10304: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -9917,7 +10312,7 @@
+ 
+ 	
+ 
+-echo "configure:8957: checking for krb_disable_debug" >&5
++echo "configure:10315: checking for krb_disable_debug" >&5
+ echo $ECHO_N "checking for krb_disable_debug... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_disable_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9932,8 +10327,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 8972 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 10331 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9943,14 +10338,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:8982: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10343: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_disable_debug=$ac_lib; else ac_cv_funclib_krb_disable_debug=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_krb_disable_debug=\${ac_cv_funclib_krb_disable_debug-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -9965,13 +10361,13 @@
+ for ac_func in krb_disable_debug
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:9000: checking for $ac_func" >&5
++echo "configure:10364: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9006 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10370 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -10000,17 +10396,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9034: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10401: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:9043: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10410: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -10034,13 +10431,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:9063: result: yes" >&5
++	echo "configure:10434: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_disable_debug=no"
+ 	eval "LIB_krb_disable_debug="
+-	echo "configure:9069: result: no" >&5
++	echo "configure:10440: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -10054,7 +10451,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:9081: result: yes, in $ac_res" >&5
++	echo "configure:10454: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -10065,7 +10462,7 @@
+ 
+ 	
+ 
+-echo "configure:9089: checking for krb_get_our_ip_for_realm" >&5
++echo "configure:10465: checking for krb_get_our_ip_for_realm" >&5
+ echo $ECHO_N "checking for krb_get_our_ip_for_realm... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_get_our_ip_for_realm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10080,8 +10477,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 9104 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 10481 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -10091,14 +10488,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9114: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10493: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_get_our_ip_for_realm=$ac_lib; else ac_cv_funclib_krb_get_our_ip_for_realm=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_krb_get_our_ip_for_realm=\${ac_cv_funclib_krb_get_our_ip_for_realm-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -10113,13 +10511,13 @@
+ for ac_func in krb_get_our_ip_for_realm
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:9132: checking for $ac_func" >&5
++echo "configure:10514: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9138 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10520 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -10148,17 +10546,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9166: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:10551: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:9175: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10560: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -10182,13 +10581,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:9195: result: yes" >&5
++	echo "configure:10584: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_get_our_ip_for_realm=no"
+ 	eval "LIB_krb_get_our_ip_for_realm="
+-	echo "configure:9201: result: no" >&5
++	echo "configure:10590: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -10202,7 +10601,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:9213: result: yes, in $ac_res" >&5
++	echo "configure:10604: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -10211,13 +10610,13 @@
+ 	LIBS="$LIB_krb_get_our_ip_for_realm $LIBS"
+ fi
+ 
+-	echo "configure:9220: checking for krb_mk_req with const arguments" >&5
++	echo "configure:10613: checking for krb_mk_req with const arguments" >&5
+ echo $ECHO_N "checking for krb_mk_req with const arguments... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_mk_req_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9226 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 10619 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ 		int krb_mk_req(KTEXT a, const char *s, const char *i,
+@@ -10230,18 +10629,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9239: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:10634: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_mk_req_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_krb_mk_req_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 	
+ fi
+-echo "configure:9249: result: $ac_cv_func_krb_mk_req_const" >&5
++echo "configure:10644: result: $ac_cv_func_krb_mk_req_const" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_mk_req_const" >&6
+ 	if test "$ac_cv_func_krb_mk_req_const" = "yes"; then
+ 		
+@@ -10292,7 +10692,7 @@
+ if test "${enable_dce+set}" = set; then
+   enableval="$enable_dce"
+ 
+-fi
++fi;
+ if test "$enable_dce" = yes; then
+ 
+ cat >>confdefs.h <<\EOF
+@@ -10322,7 +10722,7 @@
+ if test "${enable_kaserver+set}" = set; then
+   enableval="$enable_kaserver"
+ 
+-fi
++fi;
+ if test "$enable_kaserver" = yes; then
+ 	
+ cat >>confdefs.h <<\EOF
+@@ -10339,7 +10739,7 @@
+ if test "${enable_kaserver_db+set}" = set; then
+   enableval="$enable_kaserver_db"
+ 
+-fi
++fi;
+ if test "$enable_kaserver_db" = yes; then
+ 	
+ cat >>confdefs.h <<\EOF
+@@ -10361,7 +10761,7 @@
+ 	otp=no
+ fi
+ 
+-fi
++fi;
+ if test "$otp" = "yes"; then
+ 	
+ cat >>confdefs.h <<\EOF
+@@ -10383,7 +10783,7 @@
+ if test "${enable_osfc2+set}" = set; then
+   enableval="$enable_osfc2"
+ 
+-fi
++fi;
+ LIB_security=
+ if test "$enable_osfc2" = yes; then
+ 	
+@@ -10396,7 +10796,7 @@
+ 
+ # Extract the first word of "nroff", so it can be a program name with args.
+ set dummy nroff; ac_word=$2
+-echo "configure:9377: checking for $ac_word" >&5
++echo "configure:10799: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_NROFF+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10412,7 +10812,7 @@
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+   if test -f "$ac_dir/$ac_word"; then
+-   ac_cv_path_NROFF=$ac_dir/$ac_word
++   ac_cv_path_NROFF="$ac_dir/$ac_word"
+    break
+ fi
+ done
+@@ -10421,17 +10821,18 @@
+ esac
+ fi
+ NROFF=$ac_cv_path_NROFF
++
+ if test -n "$NROFF"; then
+-  echo "configure:9402: result: $NROFF" >&5
++  echo "configure:10826: result: $NROFF" >&5
+ echo "${ECHO_T}$NROFF" >&6
+ else
+-  echo "configure:9405: result: no" >&5
++  echo "configure:10829: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ # Extract the first word of "groff", so it can be a program name with args.
+ set dummy groff; ac_word=$2
+-echo "configure:9410: checking for $ac_word" >&5
++echo "configure:10835: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_GROFF+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10447,7 +10848,7 @@
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+   if test -f "$ac_dir/$ac_word"; then
+-   ac_cv_path_GROFF=$ac_dir/$ac_word
++   ac_cv_path_GROFF="$ac_dir/$ac_word"
+    break
+ fi
+ done
+@@ -10456,15 +10857,16 @@
+ esac
+ fi
+ GROFF=$ac_cv_path_GROFF
++
+ if test -n "$GROFF"; then
+-  echo "configure:9435: result: $GROFF" >&5
++  echo "configure:10862: result: $GROFF" >&5
+ echo "${ECHO_T}$GROFF" >&6
+ else
+-  echo "configure:9438: result: no" >&5
++  echo "configure:10865: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "configure:9441: checking how to format man pages" >&5
++echo "configure:10869: checking how to format man pages" >&5
+ echo $ECHO_N "checking how to format man pages... $ECHO_C" >&6
+ if test "${ac_cv_sys_man_format+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -10500,97 +10902,371 @@
+ 	ac_cv_sys_man_format="$ac_cv_sys_man_format \$< > \$@"
+ fi
+ 
+-fi
+-echo "configure:9476: result: $ac_cv_sys_man_format" >&5
+-echo "${ECHO_T}$ac_cv_sys_man_format" >&6
+-if test "$ac_cv_sys_man_format"; then
+-	CATMAN="$ac_cv_sys_man_format"
+-	
+-fi
++fi
++echo "configure:10906: result: $ac_cv_sys_man_format" >&5
++echo "${ECHO_T}$ac_cv_sys_man_format" >&6
++if test "$ac_cv_sys_man_format"; then
++	CATMAN="$ac_cv_sys_man_format"
++	
++fi
++
++if test "$CATMAN"; then
++  CATMAN_TRUE=
++  CATMAN_FALSE='#'
++else
++  CATMAN_TRUE='#'
++  CATMAN_FALSE=
++fi
++echo "configure:10920: checking extension of pre-formatted manual pages" >&5
++echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
++if test "${ac_cv_sys_catman_ext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
++	ac_cv_sys_catman_ext=0
++else
++	ac_cv_sys_catman_ext=number
++fi
++
++fi
++echo "configure:10932: result: $ac_cv_sys_catman_ext" >&5
++echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
++if test "$ac_cv_sys_catman_ext" = number; then
++	CATMANEXT='$$section'
++else
++	CATMANEXT=0
++fi
++
++# Check whether --with-readline or --without-readline was given.
++if test "${with_readline+set}" = set; then
++  withval="$with_readline"
++
++fi;
++
++# Check whether --with-readline-lib or --without-readline-lib was given.
++if test "${with_readline_lib+set}" = set; then
++  withval="$with_readline_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-readline-lib" >&2; exit 1; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi;
++
++# Check whether --with-readline-include or --without-readline-include was given.
++if test "${with_readline_include+set}" = set; then
++  withval="$with_readline_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-readline-include" >&2; exit 1; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi;
++
++echo "configure:10966: checking for readline" >&5
++echo $ECHO_N "checking for readline... $ECHO_C" >&6
++
++case "$with_readline" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_readline_include" = ""; then
++		with_readline_include="$with_readline/include"
++	fi
++	if test "$with_readline_lib" = ""; then
++		with_readline_lib="$with_readline/lib$abilibdirext"
++	fi
++	;;
++esac
++header_dirs=
++lib_dirs=
++d=''
++for i in $d /usr; do
++	header_dirs="$header_dirs $i/include"
++	lib_dirs="$lib_dirs $i/lib$abilibdirext"
++done
++
++case "$with_readline_include" in
++yes) ;;
++no)  ;;
++*)   header_dirs="$with_readline_include $header_dirs";;
++esac
++case "$with_readline_lib" in
++yes) ;;
++no)  ;;
++*)   lib_dirs="$with_readline_lib $lib_dirs";;
++esac
++
++save_CFLAGS="$CFLAGS"
++save_LIBS="$LIBS"
++ires= lres=
++for i in $header_dirs; do
++	CFLAGS="-I$i $save_CFLAGS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11006 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11019: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ires=$i;break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++for i in $lib_dirs; do
++	LIBS="-L$i -lreadline  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11030 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11043: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lres=$i;break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++done
++CFLAGS="$save_CFLAGS"
++LIBS="$save_LIBS"
++
++if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
++	readline_includedir="$ires"
++	readline_libdir="$lres"
++	DIR_readline=
++	INCLUDE_readline="-I$readline_includedir"
++	LIB_readline="-L$readline_libdir -lreadline"
++	
++cat >>confdefs.h <<EOF
++#define READLINE 1
++EOF
++
++	with_readline=yes
++	echo "configure:11066: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++else
++	DIR_readline="readline"
++	INCLUDE_readline=
++	LIB_readline=
++	with_readline=no
++	echo "configure:11073: result: $with_readline" >&5
++echo "${ECHO_T}$with_readline" >&6
++fi
++
++# Check whether --with-com_err or --without-com_err was given.
++if test "${with_com_err+set}" = set; then
++  withval="$with_com_err"
++
++fi;
++
++# Check whether --with-com_err-lib or --without-com_err-lib was given.
++if test "${with_com_err_lib+set}" = set; then
++  withval="$with_com_err_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-com_err-lib" >&2; exit 1; }
++elif test "X$with_com_err" = "X"; then
++  with_com_err=yes
++fi
++fi;
++
++# Check whether --with-com_err-include or --without-com_err-include was given.
++if test "${with_com_err_include+set}" = set; then
++  withval="$with_com_err_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-com_err-include" >&2; exit 1; }
++elif test "X$with_com_err" = "X"; then
++  with_com_err=yes
++fi
++fi;
++
++echo "configure:11103: checking for com_err" >&5
++echo $ECHO_N "checking for com_err... $ECHO_C" >&6
++
++case "$with_com_err" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_com_err_include" = ""; then
++		with_com_err_include="$with_com_err/include"
++	fi
++	if test "$with_com_err_lib" = ""; then
++		with_com_err_lib="$with_com_err/lib$abilibdirext"
++	fi
++	;;
++esac
++header_dirs=
++lib_dirs=
++d=''
++for i in $d /usr; do
++	header_dirs="$header_dirs $i/include"
++	lib_dirs="$lib_dirs $i/lib$abilibdirext"
++done
++
++case "$with_com_err_include" in
++yes) ;;
++no)  ;;
++*)   header_dirs="$with_com_err_include $header_dirs";;
++esac
++case "$with_com_err_lib" in
++yes) ;;
++no)  ;;
++*)   lib_dirs="$with_com_err_lib $lib_dirs";;
++esac
+ 
+-if test "$CATMAN"; then
+-  CATMAN_TRUE=
+-  CATMAN_FALSE='#'
+-else
+-  CATMAN_TRUE='#'
+-  CATMAN_FALSE=
+-fi
+-echo "configure:9489: checking extension of pre-formatted manual pages" >&5
+-echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
+-if test "${ac_cv_sys_catman_ext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
+-	ac_cv_sys_catman_ext=0
++save_CFLAGS="$CFLAGS"
++save_LIBS="$LIBS"
++ires= lres=
++for i in $header_dirs; do
++	CFLAGS="-I$i $save_CFLAGS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11143 "configure"
++#include "confdefs.h"
++#include <et/com_err.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11155: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ires=$i;break
+ else
+-	ac_cv_sys_catman_ext=number
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++for i in $lib_dirs; do
++	LIBS="-L$i -lcom_err  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11166 "configure"
++#include "confdefs.h"
++#include <et/com_err.h>
++int
++main ()
++{
+ 
+-fi
+-echo "configure:9500: result: $ac_cv_sys_catman_ext" >&5
+-echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
+-if test "$ac_cv_sys_catman_ext" = number; then
+-	CATMANEXT='$$section'
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11178: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lres=$i;break
+ else
+-	CATMANEXT=0
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++done
++CFLAGS="$save_CFLAGS"
++LIBS="$save_LIBS"
+ 
+-# Check whether --with-readline or --without-readline was given.
+-if test "${with_readline+set}" = set; then
+-  withval="$with_readline"
++if test "$ires" -a "$lres" -a "$with_com_err" != "no"; then
++	com_err_includedir="$ires"
++	com_err_libdir="$lres"
++	DIR_com_err=
++	INCLUDE_com_err="-I$com_err_includedir"
++	LIB_com_err="-L$com_err_libdir -lcom_err"
++	
++cat >>confdefs.h <<EOF
++#define COM_ERR 1
++EOF
+ 
+-fi
+-# Check whether --with-readline-lib or --without-readline-lib was given.
+-if test "${with_readline_lib+set}" = set; then
+-  withval="$with_readline_lib"
++	with_com_err=yes
++	echo "configure:11201: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++else
++	DIR_com_err="com_err"
++	INCLUDE_com_err=
++	LIB_com_err=
++	with_com_err=no
++	echo "configure:11208: result: $with_com_err" >&5
++echo "${ECHO_T}$with_com_err" >&6
++fi
++
++# Check whether --with-ss or --without-ss was given.
++if test "${with_ss+set}" = set; then
++  withval="$with_ss"
++
++fi;
++
++# Check whether --with-ss-lib or --without-ss-lib was given.
++if test "${with_ss_lib+set}" = set; then
++  withval="$with_ss_lib"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { echo "configure: error: No argument for --with-readline-lib" >&2; exit 1; }
+-elif test "X$with_readline" = "X"; then
+-  with_readline=yes
+-fi
+-fi
+-# Check whether --with-readline-include or --without-readline-include was given.
+-if test "${with_readline_include+set}" = set; then
+-  withval="$with_readline_include"
++  { echo "configure: error: No argument for --with-ss-lib" >&2; exit 1; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
++fi
++fi;
++
++# Check whether --with-ss-include or --without-ss-include was given.
++if test "${with_ss_include+set}" = set; then
++  withval="$with_ss_include"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { echo "configure: error: No argument for --with-readline-include" >&2; exit 1; }
+-elif test "X$with_readline" = "X"; then
+-  with_readline=yes
+-fi
++  { echo "configure: error: No argument for --with-ss-include" >&2; exit 1; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
+ fi
++fi;
+ 
+-echo "configure:9529: checking for readline" >&5
+-echo $ECHO_N "checking for readline... $ECHO_C" >&6
++echo "configure:11238: checking for ss" >&5
++echo $ECHO_N "checking for ss... $ECHO_C" >&6
+ 
+-case "$with_readline" in
++case "$with_ss" in
+ yes)	;;
+ no)	;;
+ "")	;;
+-*)	if test "$with_readline_include" = ""; then
+-		with_readline_include="$with_readline/include"
++*)	if test "$with_ss_include" = ""; then
++		with_ss_include="$with_ss/include"
+ 	fi
+-	if test "$with_readline_lib" = ""; then
+-		with_readline_lib="$with_readline/lib$abilibdirext"
++	if test "$with_ss_lib" = ""; then
++		with_ss_lib="$with_ss/lib$abilibdirext"
+ 	fi
+ 	;;
+ esac
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+ 
+-case "$with_readline_include" in
++case "$with_ss_include" in
+ yes) ;;
+ no)  ;;
+-*)   header_dirs="$with_readline_include $header_dirs";;
++*)   header_dirs="$with_ss_include $header_dirs";;
+ esac
+-case "$with_readline_lib" in
++case "$with_ss_lib" in
+ yes) ;;
+ no)  ;;
+-*)   lib_dirs="$with_readline_lib $lib_dirs";;
++*)   lib_dirs="$with_ss_lib $lib_dirs";;
+ esac
+ 
+ save_CFLAGS="$CFLAGS"
+@@ -10598,11 +11274,10 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9566 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11278 "configure"
+ #include "confdefs.h"
+-#include <stdio.h>
+- #include <readline.h>
++#include <ss.h>
+ int
+ main ()
+ {
+@@ -10610,22 +11285,22 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9577: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11290: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+-	LIBS="-L$i -lreadline  $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9588 "configure"
++	LIBS="-L$i -lss  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11301 "configure"
+ #include "confdefs.h"
+-#include <stdio.h>
+- #include <readline.h>
++#include <ss.h>
+ int
+ main ()
+ {
+@@ -10633,44 +11308,48 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9599: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11313: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ 
+-if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
+-	readline_includedir="$ires"
+-	readline_libdir="$lres"
+-	INCLUDE_readline="-I$readline_includedir"
+-	LIB_readline="-L$readline_libdir -lreadline"
++if test "$ires" -a "$lres" -a "$with_ss" != "no"; then
++	ss_includedir="$ires"
++	ss_libdir="$lres"
++	DIR_ss=
++	INCLUDE_ss="-I$ss_includedir"
++	LIB_ss="-L$ss_libdir -lss"
+ 	
+ cat >>confdefs.h <<EOF
+-#define READLINE 1
++#define SS 1
+ EOF
+ 
+-	with_readline=yes
+-	echo "configure:9619: result: headers $ires, libraries $lres" >&5
++	with_ss=yes
++	echo "configure:11336: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
+-	INCLUDE_readline=
+-	LIB_readline=
+-	with_readline=no
+-	echo "configure:9625: result: $with_readline" >&5
+-echo "${ECHO_T}$with_readline" >&6
++	DIR_ss="ss"
++	INCLUDE_ss=
++	LIB_ss=
++	with_ss=no
++	echo "configure:11343: result: $with_ss" >&5
++echo "${ECHO_T}$with_ss" >&6
+ fi
+ 
+ # Check whether --with-hesiod or --without-hesiod was given.
+ if test "${with_hesiod+set}" = set; then
+   withval="$with_hesiod"
+ 
+-fi
++fi;
++
+ # Check whether --with-hesiod-lib or --without-hesiod-lib was given.
+ if test "${with_hesiod_lib+set}" = set; then
+   withval="$with_hesiod_lib"
+@@ -10679,7 +11358,8 @@
+ elif test "X$with_hesiod" = "X"; then
+   with_hesiod=yes
+ fi
+-fi
++fi;
++
+ # Check whether --with-hesiod-include or --without-hesiod-include was given.
+ if test "${with_hesiod_include+set}" = set; then
+   withval="$with_hesiod_include"
+@@ -10688,9 +11368,9 @@
+ elif test "X$with_hesiod" = "X"; then
+   with_hesiod=yes
+ fi
+-fi
++fi;
+ 
+-echo "configure:9650: checking for hesiod" >&5
++echo "configure:11373: checking for hesiod" >&5
+ echo $ECHO_N "checking for hesiod... $ECHO_C" >&6
+ 
+ case "$with_hesiod" in
+@@ -10708,7 +11388,7 @@
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -10729,8 +11409,8 @@
+ ires= lres=
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9687 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11413 "configure"
+ #include "confdefs.h"
+ #include <hesiod.h>
+ int
+@@ -10740,19 +11420,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9697: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11425: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lhesiod  $save_LIBS"
+-	cat >conftest.$ac_ext <<EOF
+-#line 9708 "configure"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 11436 "configure"
+ #include "confdefs.h"
+ #include <hesiod.h>
+ int
+@@ -10762,14 +11443,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9718: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11448: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+@@ -10777,6 +11459,7 @@
+ if test "$ires" -a "$lres" -a "$with_hesiod" != "no"; then
+ 	hesiod_includedir="$ires"
+ 	hesiod_libdir="$lres"
++	DIR_hesiod=
+ 	INCLUDE_hesiod="-I$hesiod_includedir"
+ 	LIB_hesiod="-L$hesiod_libdir -lhesiod"
+ 	
+@@ -10785,13 +11468,14 @@
+ EOF
+ 
+ 	with_hesiod=yes
+-	echo "configure:9738: result: headers $ires, libraries $lres" >&5
++	echo "configure:11471: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_hesiod="hesiod"
+ 	INCLUDE_hesiod=
+ 	LIB_hesiod=
+ 	with_hesiod=no
+-	echo "configure:9744: result: $with_hesiod" >&5
++	echo "configure:11478: result: $with_hesiod" >&5
+ echo "${ECHO_T}$with_hesiod" >&6
+ fi
+ 
+@@ -10799,19 +11483,19 @@
+ if test "${enable_bigendian+set}" = set; then
+   enableval="$enable_bigendian"
+   krb_cv_c_bigendian=yes
+-fi
++fi;
+ # Check whether --enable-littleendian or --disable-littleendian was given.
+ if test "${enable_littleendian+set}" = set; then
+   enableval="$enable_littleendian"
+   krb_cv_c_bigendian=no
+-fi
+-echo "configure:9757: checking whether byte order is known at compile time" >&5
++fi;
++echo "configure:11492: checking whether byte order is known at compile time" >&5
+ echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
+ if test "${krb_cv_c_bigendian_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9763 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11498 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -10826,27 +11510,28 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9777: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11515: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   krb_cv_c_bigendian_compile=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   krb_cv_c_bigendian_compile=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:9786: result: $krb_cv_c_bigendian_compile" >&5
++echo "configure:11524: result: $krb_cv_c_bigendian_compile" >&5
+ echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
+-echo "configure:9788: checking whether byte ordering is bigendian" >&5
++echo "configure:11526: checking whether byte ordering is bigendian" >&5
+ echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+ if test "${krb_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+   if test "$krb_cv_c_bigendian_compile" = "yes"; then
+-    cat >conftest.$ac_ext <<EOF
+-#line 9795 "configure"
++    cat >conftest.$ac_ext <<_ACEOF
++#line 11534 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -10861,21 +11546,22 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9809: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11551: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   krb_cv_c_bigendian=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   krb_cv_c_bigendian=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+   else
+     if test "$cross_compiling" = yes; then
+   { echo "configure: error: specify either --enable-bigendian or --enable-littleendian" >&2; exit 1; }
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9822 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11564 "configure"
+ #include "confdefs.h"
+ main () {
+       /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -10887,22 +11573,23 @@
+     u.l = 1;
+     exit (u.c[sizeof (long) - 1] == 1);
+   }
+-EOF
+-if { (eval echo configure:9835: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:11578: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   krb_cv_c_bigendian=no
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   krb_cv_c_bigendian=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+   fi
+ 
+ fi
+-echo "configure:9847: result: $krb_cv_c_bigendian" >&5
++echo "configure:11592: result: $krb_cv_c_bigendian" >&5
+ echo "${ECHO_T}$krb_cv_c_bigendian" >&6
+ if test "$krb_cv_c_bigendian" = "yes"; then
+ 
+@@ -10917,32 +11604,33 @@
+ EOF
+ fi
+ 
+-echo "configure:9859: checking for inline" >&5
++echo "configure:11607: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<EOF
+-#line 9867 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11615 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ $ac_kw int foo () {return 0; }
+ #endif
+ 
+-EOF
+-if { (eval echo configure:9873: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:11623: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+-echo "configure:9882: result: $ac_cv_c_inline" >&5
++echo "configure:11633: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -10992,7 +11680,7 @@
+   AIX_DYNAMIC_AFS_FALSE=
+ fi
+ 
+-echo "configure:9927: checking for dlopen" >&5
++echo "configure:11683: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11007,8 +11695,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 9942 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 11699 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -11018,14 +11706,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:9952: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11711: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dlopen=$ac_lib; else ac_cv_funclib_dlopen=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dlopen=\${ac_cv_funclib_dlopen-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -11040,13 +11729,13 @@
+ for ac_func in dlopen
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:9970: checking for $ac_func" >&5
++echo "configure:11732: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 9976 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11738 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -11075,17 +11764,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10004: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:11769: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10013: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:11778: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -11109,13 +11799,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:10033: result: yes" >&5
++	echo "configure:11802: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dlopen=no"
+ 	eval "LIB_dlopen="
+-	echo "configure:10039: result: no" >&5
++	echo "configure:11808: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -11129,7 +11819,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:10051: result: yes, in $ac_res" >&5
++	echo "configure:11822: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -11168,14 +11858,14 @@
+   IRIX_FALSE=
+ fi
+ 
+-echo "configure:10085: checking for X" >&5
++echo "configure:11861: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+   withval="$with_x"
+ 
+-fi
++fi;
+ # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+ if test "x$with_x" = xno; then
+   # The user explicitly disabled X.
+@@ -11264,19 +11954,27 @@
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+-  cat >conftest.$ac_ext <<EOF
+-#line 10172 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11958 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:10177: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:11963: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   for ac_dir in $ac_x_header_dirs; do
+@@ -11287,6 +11985,7 @@
+ done
+ fi
+ rm -f conftest*
++
+ fi # $ac_x_includes = no
+ 
+ if test "$ac_x_libraries" = no; then
+@@ -11295,8 +11994,8 @@
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+-  cat >conftest.$ac_ext <<EOF
+-#line 10202 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 11998 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -11306,8 +12005,9 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10213: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12010: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -11326,7 +12026,7 @@
+   done
+ done
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = no
+ 
+ if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+@@ -11343,7 +12043,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "configure:10247: result: $have_x" >&5
++  echo "configure:12046: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -11353,7 +12053,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "configure:10257: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "configure:12056: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -11377,43 +12077,39 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "configure:10277: checking whether -R must be followed by a space" >&5
++      echo "configure:12080: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+-      cat >conftest.$ac_ext <<EOF
+-
+-EOF
+-if { (eval echo configure:10282: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++      rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12084: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_R_nospace=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_R_nospace=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext
+       if test $ac_R_nospace = yes; then
+-	echo "configure:10291: result: no" >&5
++	echo "configure:12093: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+-	cat >conftest.$ac_ext <<EOF
+-
+-EOF
+-if { (eval echo configure:10298: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++	rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12099: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_R_space=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_R_space=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext
+ 	if test $ac_R_space = yes; then
+-	  echo "configure:10307: result: yes" >&5
++	  echo "configure:12108: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "configure:10311: result: neither works" >&5
++	  echo "configure:12112: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -11432,19 +12128,15 @@
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10331: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:12131: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10339 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12139 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11461,18 +12153,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10356: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12158: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10366: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "configure:12168: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+@@ -11480,19 +12173,15 @@
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10376: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:12176: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10384 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12184 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11509,18 +12198,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10401: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12203: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10411: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "configure:12213: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -11536,13 +12226,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "configure:10425: checking for gethostbyname" >&5
++    echo "configure:12229: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10431 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12235 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -11571,34 +12261,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10459: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12266: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_gethostbyname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_gethostbyname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10468: result: $ac_cv_func_gethostbyname" >&5
++echo "configure:12275: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10475: checking for gethostbyname in -lnsl" >&5
++echo "configure:12280: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10483 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12288 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11615,18 +12302,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10500: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12307: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_nsl_gethostbyname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10510: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "configure:12317: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+@@ -11634,19 +12322,15 @@
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10520: checking for gethostbyname in -lbsd" >&5
++echo "configure:12325: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10528 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12333 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11663,18 +12347,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10545: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12352: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_bsd_gethostbyname=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10555: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "configure:12362: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -11690,13 +12375,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "configure:10569: checking for connect" >&5
++    echo "configure:12378: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10575 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12384 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -11725,34 +12410,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10603: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12415: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_connect=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_connect=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10612: result: $ac_cv_func_connect" >&5
++echo "configure:12424: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10619: checking for connect in -lsocket" >&5
++echo "configure:12429: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10627 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12437 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11769,18 +12451,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10644: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12456: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_socket_connect=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_socket_connect=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10654: result: $ac_cv_lib_socket_connect" >&5
++echo "configure:12466: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -11789,13 +12472,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "configure:10661: checking for remove" >&5
++    echo "configure:12475: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10667 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12481 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -11824,34 +12507,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10695: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12512: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_remove=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_remove=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10704: result: $ac_cv_func_remove" >&5
++echo "configure:12521: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10711: checking for remove in -lposix" >&5
++echo "configure:12526: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10719 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12534 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11868,18 +12548,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10736: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12553: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_posix_remove=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_posix_remove=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10746: result: $ac_cv_lib_posix_remove" >&5
++echo "configure:12563: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -11888,13 +12569,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "configure:10753: checking for shmat" >&5
++    echo "configure:12572: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10759 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12578 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -11923,34 +12604,31 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10787: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12609: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_shmat=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_shmat=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:10796: result: $ac_cv_func_shmat" >&5
++echo "configure:12618: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10803: checking for shmat in -lipc" >&5
++echo "configure:12623: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10811 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12631 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -11967,18 +12645,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10828: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12650: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ipc_shmat=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10838: result: $ac_cv_lib_ipc_shmat" >&5
++echo "configure:12660: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -11997,19 +12676,15 @@
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+ 
+-case "${LDFLAGS+set} $ac_configure_args" in
+- *" LDFLAGS="* );;
+- "set "*) ac_configure_args="LDFLAGS='$LDFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:10858: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:12679: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<EOF
+-#line 10866 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 12687 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -12026,18 +12701,19 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:10883: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12706: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "configure:10893: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "configure:12716: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -12050,7 +12726,7 @@
+ # try to figure out if we need any additional ld flags, like -R
+ # and yes, the autoconf X test is utterly broken
+ if test "$no_x" != yes; then
+-	echo "configure:10903: checking for special X linker flags" >&5
++	echo "configure:12729: checking for special X linker flags" >&5
+ echo $ECHO_N "checking for special X linker flags... $ECHO_C" >&6
+ if test "${krb_cv_sys_x_libs_rpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12081,8 +12757,8 @@
+ 		if test "$cross_compiling" = yes; then
+   { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 10934 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12761 "configure"
+ #include "confdefs.h"
+ 
+ 		#include <X11/Xlib.h>
+@@ -12095,16 +12771,17 @@
+ 		return 0;
+ 		}
+ 		
+-EOF
+-if { (eval echo configure:10947: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:12776: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   :
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ 	done
+@@ -12112,7 +12789,7 @@
+ 	CFLAGS="$ac_save_cflags"
+ 	
+ fi
+-echo "configure:10962: result: $krb_cv_sys_x_libs_rpath" >&5
++echo "configure:12792: result: $krb_cv_sys_x_libs_rpath" >&5
+ echo "${ECHO_T}$krb_cv_sys_x_libs_rpath" >&6
+ 	X_LIBS="$krb_cv_sys_x_libs"
+ fi
+@@ -12132,7 +12809,7 @@
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+-echo "configure:10979: checking for XauWriteAuth" >&5
++echo "configure:12812: checking for XauWriteAuth" >&5
+ echo $ECHO_N "checking for XauWriteAuth... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauWriteAuth+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12147,8 +12824,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 10994 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 12828 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12158,14 +12835,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11004: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12840: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauWriteAuth=$ac_lib; else ac_cv_funclib_XauWriteAuth=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_XauWriteAuth=\${ac_cv_funclib_XauWriteAuth-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -12180,13 +12858,13 @@
+ for ac_func in XauWriteAuth
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:11022: checking for $ac_func" >&5
++echo "configure:12861: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11028 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 12867 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12215,17 +12893,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11056: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12898: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:11065: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:12907: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12249,13 +12928,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:11085: result: yes" >&5
++	echo "configure:12931: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauWriteAuth=no"
+ 	eval "LIB_XauWriteAuth="
+-	echo "configure:11091: result: no" >&5
++	echo "configure:12937: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12269,7 +12948,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:11103: result: yes, in $ac_res" >&5
++	echo "configure:12951: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12277,7 +12956,7 @@
+ ac_xxx="$LIBS"
+ LIBS="$LIB_XauWriteAuth $LIBS"
+ 
+-echo "configure:11109: checking for XauReadAuth" >&5
++echo "configure:12959: checking for XauReadAuth" >&5
+ echo $ECHO_N "checking for XauReadAuth... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauReadAuth+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12292,8 +12971,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 11124 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 12975 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12303,14 +12982,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11134: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:12987: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauReadAuth=$ac_lib; else ac_cv_funclib_XauReadAuth=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_XauReadAuth=\${ac_cv_funclib_XauReadAuth-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -12325,13 +13005,13 @@
+ for ac_func in XauReadAuth
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:11152: checking for $ac_func" >&5
++echo "configure:13008: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11158 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13014 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12360,17 +13040,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11186: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:13045: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:11195: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:13054: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12394,13 +13075,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:11215: result: yes" >&5
++	echo "configure:13078: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauReadAuth=no"
+ 	eval "LIB_XauReadAuth="
+-	echo "configure:11221: result: no" >&5
++	echo "configure:13084: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12414,14 +13095,14 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:11233: result: yes, in $ac_res" >&5
++	echo "configure:13098: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ LIBS="$LIB_XauReadAauth $LIBS"
+ 
+-echo "configure:11238: checking for XauFileName" >&5
++echo "configure:13105: checking for XauFileName" >&5
+ echo $ECHO_N "checking for XauFileName... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauFileName+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12436,8 +13117,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 11253 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 13121 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12447,14 +13128,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11263: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:13133: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauFileName=$ac_lib; else ac_cv_funclib_XauFileName=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_XauFileName=\${ac_cv_funclib_XauFileName-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -12469,13 +13151,13 @@
+ for ac_func in XauFileName
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:11281: checking for $ac_func" >&5
++echo "configure:13154: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11287 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13160 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12504,17 +13186,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11315: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:13191: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:11324: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:13200: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12538,13 +13221,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:11344: result: yes" >&5
++	echo "configure:13224: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauFileName=no"
+ 	eval "LIB_XauFileName="
+-	echo "configure:11350: result: no" >&5
++	echo "configure:13230: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12558,7 +13241,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:11362: result: yes, in $ac_res" >&5
++	echo "configure:13244: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12609,13 +13292,13 @@
+ LIBS=$save_LIBS
+ LDFLAGS=$save_LDFLAGS
+ 
+-echo "configure:11408: checking for an ANSI C-conforming const" >&5
++echo "configure:13295: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11414 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13301 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12671,17 +13354,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11468: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13359: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_c_const=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11477: result: $ac_cv_c_const" >&5
++echo "configure:13368: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -12691,13 +13375,13 @@
+ 
+ fi
+ 
+-echo "configure:11484: checking for off_t" >&5
++echo "configure:13378: checking for off_t" >&5
+ echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+ if test "${ac_cv_type_off_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11490 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13384 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12710,17 +13394,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11504: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13399: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_off_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_off_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11513: result: $ac_cv_type_off_t" >&5
++echo "configure:13408: result: $ac_cv_type_off_t" >&5
+ echo "${ECHO_T}$ac_cv_type_off_t" >&6
+ if test $ac_cv_type_off_t = yes; then
+   :
+@@ -12732,13 +13417,13 @@
+ 
+ fi
+ 
+-echo "configure:11522: checking for size_t" >&5
++echo "configure:13420: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11528 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13426 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12751,17 +13436,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11542: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13441: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_size_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11551: result: $ac_cv_type_size_t" >&5
++echo "configure:13450: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -12773,13 +13459,13 @@
+ 
+ fi
+ 
+-echo "configure:11560: checking for ssize_t" >&5
++echo "configure:13462: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11566 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13468 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12787,7 +13473,7 @@
+ #include <stddef.h>
+ #endif
+ #include <unistd.h>
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_ssize_t=yes
+@@ -12797,7 +13483,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11583: result: $ac_cv_type_ssize_t" >&5
++echo "configure:13486: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = no; then
+ 
+@@ -12807,13 +13493,13 @@
+ 
+ fi
+ 
+-echo "configure:11590: checking for pid_t" >&5
++echo "configure:13496: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11596 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13502 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -12826,17 +13512,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11610: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13517: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_pid_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11619: result: $ac_cv_type_pid_t" >&5
++echo "configure:13526: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -12848,17 +13535,17 @@
+ 
+ fi
+ 
+-echo "configure:11628: checking for uid_t in sys/types.h" >&5
++echo "configure:13538: checking for uid_t in sys/types.h" >&5
+ echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11634 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13544 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "uid_t" >/dev/null 2>&1; then
+   ac_cv_type_uid_t=yes
+@@ -12868,7 +13555,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11646: result: $ac_cv_type_uid_t" >&5
++echo "configure:13558: result: $ac_cv_type_uid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+ if test $ac_cv_type_uid_t = no; then
+ 
+@@ -12882,13 +13569,13 @@
+ 
+ fi
+ 
+-echo "configure:11656: checking for mode_t" >&5
++echo "configure:13572: checking for mode_t" >&5
+ echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+ if test "${ac_cv_type_mode_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11662 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13578 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12896,7 +13583,7 @@
+ #include <stddef.h>
+ #endif
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_mode_t=yes
+@@ -12906,7 +13593,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11678: result: $ac_cv_type_mode_t" >&5
++echo "configure:13596: result: $ac_cv_type_mode_t" >&5
+ echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+ if test $ac_cv_type_mode_t = no; then
+ 
+@@ -12916,13 +13603,13 @@
+ 
+ fi
+ 
+-echo "configure:11685: checking for sig_atomic_t" >&5
++echo "configure:13606: checking for sig_atomic_t" >&5
+ echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11691 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13612 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12930,7 +13617,7 @@
+ #include <stddef.h>
+ #endif
+ #include <signal.h>
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "sig_atomic_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   ac_cv_type_sig_atomic_t=yes
+@@ -12940,7 +13627,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "configure:11708: result: $ac_cv_type_sig_atomic_t" >&5
++echo "configure:13630: result: $ac_cv_type_sig_atomic_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
+ if test $ac_cv_type_sig_atomic_t = no; then
+ 
+@@ -12951,13 +13638,13 @@
+ fi
+ 
+ cv=`echo "long long" | sed 'y%./+- %__p__%'`
+-echo "configure:11716: checking for long long" >&5
++echo "configure:13641: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11722 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13647 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -12972,29 +13659,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11737: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13664: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:11747: result: $ac_foo" >&5
++echo "configure:13674: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:11752: checking for long long" >&5
++	echo "configure:13679: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11758 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13685 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -13007,17 +13695,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11772: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13700: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_long_long=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_long_long=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11781: result: $ac_cv_type_long_long" >&5
++echo "configure:13709: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+ 
+@@ -13035,13 +13724,13 @@
+ 
+ fi
+ 
+-echo "configure:11793: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:13727: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11799 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13733 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -13054,17 +13743,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11812: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13748: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_time=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11821: result: $ac_cv_header_time" >&5
++echo "configure:13757: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -13074,13 +13764,13 @@
+ 
+ fi
+ 
+-echo "configure:11828: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:13767: checking whether struct tm is in sys/time.h or time.h" >&5
+ echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+ if test "${ac_cv_struct_tm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11834 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13773 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -13092,17 +13782,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:11846: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:13787: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_tm=time.h
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_struct_tm=sys/time.h
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:11855: result: $ac_cv_struct_tm" >&5
++echo "configure:13796: result: $ac_cv_struct_tm" >&5
+ echo "${ECHO_T}$ac_cv_struct_tm" >&6
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+@@ -13112,27 +13803,35 @@
+ 
+ fi
+ 
+-echo "configure:11862: checking for ANSI C header files" >&5
++echo "configure:13806: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11868 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13812 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include <float.h>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:11876: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:13821: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+@@ -13141,12 +13840,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 11890 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13844 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "memchr" >/dev/null 2>&1; then
+   :
+@@ -13159,12 +13858,12 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<EOF
+-#line 11905 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13862 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "free" >/dev/null 2>&1; then
+   :
+@@ -13180,8 +13879,8 @@
+   if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 11923 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 13883 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -13205,21 +13904,22 @@
+       exit(2);
+   exit (0);
+ }
+-EOF
+-if { (eval echo configure:11947: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:13909: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+ fi
+-echo "configure:11959: result: $ac_cv_header_stdc" >&5
++echo "configure:13922: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -13261,6 +13961,7 @@
+ 	netinet/in_systm.h			\
+ 	netinet6/in6.h				\
+ 	netinfo/ni.h				\
++	openssl/crypto.h			\
+ 	paths.h					\
+ 	pthread.h				\
+ 	pty.h					\
+@@ -13322,35 +14023,41 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:12062: checking for $ac_header" >&5
++
++echo "configure:14027: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12068 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14033 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12073: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:14039: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:12085: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:14060: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13363,35 +14070,41 @@
+ for ac_header in standards.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:12100: checking for $ac_header" >&5
++
++echo "configure:14074: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12106 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14080 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12111: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:14086: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:12123: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:14107: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13405,13 +14118,13 @@
+ 
+ cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-echo "configure:12133: checking for $i" >&5
++echo "configure:14121: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12139 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14127 "configure"
+ #include "confdefs.h"
+ \
+ #ifdef HAVE_STANDARDS_H
+@@ -13419,21 +14132,30 @@
+ #endif
+ #include <$i>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12148: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:14137: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "ac_cv_header_$cv=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_header_$cv=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:12160: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "configure:14158: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
+ ac_res=`eval echo \\$ac_cv_header_$cv`
+ if test "$ac_res" = yes; then
+@@ -13450,35 +14172,41 @@
+ for ac_header in netinet/ip.h netinet/tcp.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:12179: checking for $ac_header" >&5
++
++echo "configure:14176: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12185 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14182 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:12190: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:14188: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:12202: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:14209: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13494,7 +14222,7 @@
+ if test "${enable_netinfo+set}" = set; then
+   enableval="$enable_netinfo"
+ 
+-fi
++fi;
+ 
+ if test "$ac_cv_header_netinfo_ni_h" = yes -a "$enable_netinfo" = yes; then
+ 
+@@ -13527,27 +14255,27 @@
+ if test "$withval" = "no"; then
+ 	ac_cv_lib_ipv6=no
+ fi
+-fi
++fi;
+ if test "${ac_cv_lib_ipv6+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   v6type=unknown
+ v6lib=none
+ 
+-echo "configure:12246: checking ipv6 stack type" >&5
++echo "configure:14265: checking ipv6 stack type" >&5
+ echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
+ for i in v6d toshiba kame inria zeta linux; do
+ 	case $i in
+ 	v6d)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12252 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14271 "configure"
+ #include "confdefs.h"
+ dnl
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=v6;
+@@ -13558,15 +14286,15 @@
+ 
+ 		;;
+ 	toshiba)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12270 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14290 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -13577,15 +14305,15 @@
+ 
+ 		;;
+ 	kame)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12288 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14309 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -13596,15 +14324,15 @@
+ 
+ 		;;
+ 	inria)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12306 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14328 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; CFLAGS="-DINET6 $CFLAGS"
+@@ -13613,15 +14341,15 @@
+ 
+ 		;;
+ 	zeta)
+-		cat >conftest.$ac_ext <<EOF
+-#line 12322 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14345 "configure"
+ #include "confdefs.h"
+ dnl
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "yes" >/dev/null 2>&1; then
+   v6type=$i; v6lib=inet6;
+@@ -13644,7 +14372,7 @@
+ 		break
+ 	fi
+ done
+-echo "configure:12351: result: $v6type" >&5
++echo "configure:14375: result: $v6type" >&5
+ echo "${ECHO_T}$v6type" >&6
+ 
+ if test "$v6lib" != "none"; then
+@@ -13655,8 +14383,8 @@
+ 		fi
+ 	done
+ fi
+-cat >conftest.$ac_ext <<EOF
+-#line 12362 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 14387 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -13689,20 +14417,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12390: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14422: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipv6=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_lib_ipv6=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "configure:12399: checking for IPv6" >&5
++echo "configure:14432: checking for IPv6" >&5
+ echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
+-echo "configure:12401: result: $ac_cv_lib_ipv6" >&5
++echo "configure:14434: result: $ac_cv_lib_ipv6" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 
+@@ -13712,7 +14441,7 @@
+ 
+ fi
+ 
+-echo "configure:12408: checking for socket" >&5
++echo "configure:14444: checking for socket" >&5
+ echo $ECHO_N "checking for socket... $ECHO_C" >&6
+ if test "${ac_cv_funclib_socket+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13727,8 +14456,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12423 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14460 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13738,14 +14467,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12433: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14472: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_socket=\${ac_cv_funclib_socket-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -13760,13 +14490,13 @@
+ for ac_func in socket
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12451: checking for $ac_func" >&5
++echo "configure:14493: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12457 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14499 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -13795,17 +14525,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12485: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14530: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12494: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14539: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13829,13 +14560,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12514: result: yes" >&5
++	echo "configure:14563: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_socket=no"
+ 	eval "LIB_socket="
+-	echo "configure:12520: result: no" >&5
++	echo "configure:14569: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -13849,7 +14580,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12532: result: yes, in $ac_res" >&5
++	echo "configure:14583: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -13858,7 +14589,7 @@
+ 	LIBS="$LIB_socket $LIBS"
+ fi
+ 
+-echo "configure:12539: checking for gethostbyname" >&5
++echo "configure:14592: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13873,8 +14604,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12554 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14608 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13884,14 +14615,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12564: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14620: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname=\${ac_cv_funclib_gethostbyname-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -13906,13 +14638,13 @@
+ for ac_func in gethostbyname
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12582: checking for $ac_func" >&5
++echo "configure:14641: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12588 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14647 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -13941,17 +14673,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12616: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14678: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12625: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14687: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13975,13 +14708,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12645: result: yes" >&5
++	echo "configure:14711: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname=no"
+ 	eval "LIB_gethostbyname="
+-	echo "configure:12651: result: no" >&5
++	echo "configure:14717: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -13995,7 +14728,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12663: result: yes, in $ac_res" >&5
++	echo "configure:14731: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14004,7 +14737,7 @@
+ 	LIBS="$LIB_gethostbyname $LIBS"
+ fi
+ 
+-echo "configure:12670: checking for syslog" >&5
++echo "configure:14740: checking for syslog" >&5
+ echo $ECHO_N "checking for syslog... $ECHO_C" >&6
+ if test "${ac_cv_funclib_syslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14019,8 +14752,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12685 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14756 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14030,14 +14763,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12695: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14768: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_syslog=\${ac_cv_funclib_syslog-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14052,13 +14786,13 @@
+ for ac_func in syslog
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12713: checking for $ac_func" >&5
++echo "configure:14789: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12719 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14795 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14087,17 +14821,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12747: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14826: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12756: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14835: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14121,13 +14856,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12776: result: yes" >&5
++	echo "configure:14859: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_syslog=no"
+ 	eval "LIB_syslog="
+-	echo "configure:12782: result: no" >&5
++	echo "configure:14865: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14141,7 +14876,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12794: result: yes, in $ac_res" >&5
++	echo "configure:14879: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14150,7 +14885,7 @@
+ 	LIBS="$LIB_syslog $LIBS"
+ fi
+ 
+-echo "configure:12801: checking for logwtmp" >&5
++echo "configure:14888: checking for logwtmp" >&5
+ echo $ECHO_N "checking for logwtmp... $ECHO_C" >&6
+ if test "${ac_cv_funclib_logwtmp+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14165,8 +14900,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12816 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 14904 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14176,14 +14911,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12826: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14916: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_logwtmp=$ac_lib; else ac_cv_funclib_logwtmp=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_logwtmp=\${ac_cv_funclib_logwtmp-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14198,13 +14934,13 @@
+ for ac_func in logwtmp
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12844: checking for $ac_func" >&5
++echo "configure:14937: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12850 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 14943 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14233,17 +14969,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12878: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14974: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:12887: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14983: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14267,13 +15004,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:12907: result: yes" >&5
++	echo "configure:15007: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_logwtmp=no"
+ 	eval "LIB_logwtmp="
+-	echo "configure:12913: result: no" >&5
++	echo "configure:15013: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14287,12 +15024,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:12925: result: yes, in $ac_res" >&5
++	echo "configure:15027: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:12929: checking for tgetent" >&5
++echo "configure:15032: checking for tgetent" >&5
+ echo $ECHO_N "checking for tgetent... $ECHO_C" >&6
+ if test "${ac_cv_funclib_tgetent+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14307,8 +15044,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 12944 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15048 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14318,14 +15055,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:12954: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15060: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_tgetent=$ac_lib; else ac_cv_funclib_tgetent=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_tgetent=\${ac_cv_funclib_tgetent-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14340,13 +15078,13 @@
+ for ac_func in tgetent
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:12972: checking for $ac_func" >&5
++echo "configure:15081: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 12978 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15087 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14375,17 +15113,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13006: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15118: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13015: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15127: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14409,13 +15148,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13035: result: yes" >&5
++	echo "configure:15151: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_tgetent=no"
+ 	eval "LIB_tgetent="
+-	echo "configure:13041: result: no" >&5
++	echo "configure:15157: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14429,12 +15168,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13053: result: yes, in $ac_res" >&5
++	echo "configure:15171: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:13057: checking for gethostbyname2" >&5
++echo "configure:15176: checking for gethostbyname2" >&5
+ echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14449,8 +15188,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13072 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15192 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14460,14 +15199,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13082: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15204: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_gethostbyname2=\${ac_cv_funclib_gethostbyname2-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14482,13 +15222,13 @@
+ for ac_func in gethostbyname2
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13100: checking for $ac_func" >&5
++echo "configure:15225: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13106 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15231 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14517,17 +15257,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13134: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15262: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13143: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15271: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14551,13 +15292,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13163: result: yes" >&5
++	echo "configure:15295: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname2=no"
+ 	eval "LIB_gethostbyname2="
+-	echo "configure:13169: result: no" >&5
++	echo "configure:15301: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14571,7 +15312,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13181: result: yes, in $ac_res" >&5
++	echo "configure:15315: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14580,7 +15321,7 @@
+ 	LIBS="$LIB_gethostbyname2 $LIBS"
+ fi
+ 
+-echo "configure:13188: checking for res_search" >&5
++echo "configure:15324: checking for res_search" >&5
+ echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+ if test "${ac_cv_funclib_res_search+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14595,8 +15336,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13203 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15340 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14620,14 +15361,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13226: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15366: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_res_search=\${ac_cv_funclib_res_search-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14642,13 +15384,13 @@
+ for ac_func in res_search
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13244: checking for $ac_func" >&5
++echo "configure:15387: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13250 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15393 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14677,17 +15419,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13278: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15424: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13287: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15433: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14711,13 +15454,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13307: result: yes" >&5
++	echo "configure:15457: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_search=no"
+ 	eval "LIB_res_search="
+-	echo "configure:13313: result: no" >&5
++	echo "configure:15463: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14731,7 +15474,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13325: result: yes, in $ac_res" >&5
++	echo "configure:15477: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14740,7 +15483,7 @@
+ 	LIBS="$LIB_res_search $LIBS"
+ fi
+ 
+-echo "configure:13332: checking for dn_expand" >&5
++echo "configure:15486: checking for dn_expand" >&5
+ echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14755,8 +15498,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13347 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 15502 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14780,14 +15523,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13370: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15528: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_dn_expand=\${ac_cv_funclib_dn_expand-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -14802,13 +15546,13 @@
+ for ac_func in dn_expand
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13388: checking for $ac_func" >&5
++echo "configure:15549: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13394 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15555 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14837,17 +15581,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13422: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15586: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13431: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15595: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14871,13 +15616,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13451: result: yes" >&5
++	echo "configure:15619: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dn_expand=no"
+ 	eval "LIB_dn_expand="
+-	echo "configure:13457: result: no" >&5
++	echo "configure:15625: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14891,7 +15636,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13469: result: yes, in $ac_res" >&5
++	echo "configure:15639: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -14900,7 +15645,7 @@
+ 	LIBS="$LIB_dn_expand $LIBS"
+ fi
+ 
+-echo "configure:13476: checking for working snprintf" >&5
++echo "configure:15648: checking for working snprintf" >&5
+ echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14909,8 +15654,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13486 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15658 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -14921,20 +15666,21 @@
+ 	snprintf(foo, 2, "12");
+ 	return strcmp(foo, "1");
+ }
+-EOF
+-if { (eval echo configure:13497: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:15671: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_snprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:13508: result: $ac_cv_func_snprintf_working" >&5
++echo "configure:15683: result: $ac_cv_func_snprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
+ 
+ if test "$ac_cv_func_snprintf_working" = yes; then
+@@ -14947,13 +15693,13 @@
+ if test "$ac_cv_func_snprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
+-echo "configure:13518: checking if snprintf needs a prototype" >&5
++echo "configure:15696: checking if snprintf needs a prototype" >&5
+ echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13524 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15702 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -14966,17 +15712,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13537: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:15717: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_snprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_snprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:13546: result: $ac_cv_func_snprintf_noproto" >&5
++echo "configure:15726: result: $ac_cv_func_snprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_snprintf_noproto" = yes; then
+@@ -14991,7 +15738,7 @@
+ 
+ fi
+ 
+-echo "configure:13556: checking for working vsnprintf" >&5
++echo "configure:15741: checking for working vsnprintf" >&5
+ echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15000,8 +15747,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13566 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15751 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -15022,20 +15769,21 @@
+ {
+ 	return foo(0, "12");
+ }
+-EOF
+-if { (eval echo configure:13585: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:15774: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_vsnprintf_working=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:13596: result: $ac_cv_func_vsnprintf_working" >&5
++echo "configure:15786: result: $ac_cv_func_vsnprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+@@ -15048,13 +15796,13 @@
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
+-echo "configure:13606: checking if vsnprintf needs a prototype" >&5
++echo "configure:15799: checking if vsnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13612 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15805 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -15067,17 +15815,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13625: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:15820: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vsnprintf_noproto=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_func_vsnprintf_noproto=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:13634: result: $ac_cv_func_vsnprintf_noproto" >&5
++echo "configure:15829: result: $ac_cv_func_vsnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_noproto" = yes; then
+@@ -15127,13 +15876,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13678: checking for $ac_func" >&5
++echo "configure:15879: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13684 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15885 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15162,17 +15911,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13712: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15916: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13721: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15925: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15185,35 +15935,41 @@
+ for ac_header in capability.h sys/capability.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-case "${CPPFLAGS+set} $ac_configure_args" in
+- *" CPPFLAGS="* );;
+- "set "*) ac_configure_args="CPPFLAGS='$CPPFLAGS' $ac_configure_args";;
+-esac
+-echo "configure:13736: checking for $ac_header" >&5
++
++echo "configure:15939: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13742 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15945 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ 
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:13747: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:15951: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$ac_err" >&5
++  cat conftest.err >&5
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+ rm -f conftest*
++
+ fi
+-echo "configure:13759: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:15972: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15226,13 +15982,13 @@
+ for ac_func in sgi_getcapabilitybyname cap_set_proc
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13770: checking for $ac_func" >&5
++echo "configure:15985: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13776 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 15991 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15261,17 +16017,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13804: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16022: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13813: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16031: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15281,7 +16038,7 @@
+ fi
+ done
+ 
+-echo "configure:13821: checking for getpwnam_r" >&5
++echo "configure:16041: checking for getpwnam_r" >&5
+ echo $ECHO_N "checking for getpwnam_r... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getpwnam_r+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15296,8 +16053,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 13836 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 16057 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15307,14 +16064,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13846: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16069: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getpwnam_r=$ac_lib; else ac_cv_funclib_getpwnam_r=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_getpwnam_r=\${ac_cv_funclib_getpwnam_r-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -15329,13 +16087,13 @@
+ for ac_func in getpwnam_r
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:13864: checking for $ac_func" >&5
++echo "configure:16090: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13870 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16096 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15364,17 +16122,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:13898: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16127: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:13907: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16136: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15398,13 +16157,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:13927: result: yes" >&5
++	echo "configure:16160: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getpwnam_r=no"
+ 	eval "LIB_getpwnam_r="
+-	echo "configure:13933: result: no" >&5
++	echo "configure:16166: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15418,13 +16177,13 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:13945: result: yes, in $ac_res" >&5
++	echo "configure:16180: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ if test "$ac_cv_func_getpwnam_r" = yes; then
+-	echo "configure:13950: checking if getpwnam_r is posix" >&5
++	echo "configure:16186: checking if getpwnam_r is posix" >&5
+ echo $ECHO_N "checking if getpwnam_r is posix... $ECHO_C" >&6
+ if test "${ac_cv_func_getpwnam_r_posix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15434,8 +16193,8 @@
+ 	if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 13961 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16197 "configure"
+ #include "confdefs.h"
+ 
+ #include <pwd.h>
+@@ -15445,21 +16204,22 @@
+ 	return getpwnam_r("", &pw, NULL, 0, &pwd) < 0;
+ }
+ 
+-EOF
+-if { (eval echo configure:13970: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:16209: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   ac_cv_func_getpwnam_r_posix=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getpwnam_r_posix=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ LIBS="$ac_libs"
+ fi
+-echo "configure:13982: result: $ac_cv_func_getpwnam_r_posix" >&5
++echo "configure:16222: result: $ac_cv_func_getpwnam_r_posix" >&5
+ echo "${ECHO_T}$ac_cv_func_getpwnam_r_posix" >&6
+ if test "$ac_cv_func_getpwnam_r_posix" = yes; then
+ 	
+@@ -15470,7 +16230,7 @@
+ fi
+ fi
+ 
+-echo "configure:13991: checking for getsockopt" >&5
++echo "configure:16233: checking for getsockopt" >&5
+ echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15485,8 +16245,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 14006 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 16249 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -15501,14 +16261,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14022: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16266: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_getsockopt=\${ac_cv_funclib_getsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -15523,13 +16284,13 @@
+ for ac_func in getsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:14040: checking for $ac_func" >&5
++echo "configure:16287: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14046 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16293 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15558,17 +16319,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14074: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16324: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:14083: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16333: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15592,13 +16354,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:14103: result: yes" >&5
++	echo "configure:16357: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getsockopt=no"
+ 	eval "LIB_getsockopt="
+-	echo "configure:14109: result: no" >&5
++	echo "configure:16363: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15612,12 +16374,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:14121: result: yes, in $ac_res" >&5
++	echo "configure:16377: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:14125: checking for setsockopt" >&5
++echo "configure:16382: checking for setsockopt" >&5
+ echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_setsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15632,8 +16394,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 14140 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 16398 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -15648,14 +16410,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14156: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16415: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_setsockopt=\${ac_cv_funclib_setsockopt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -15670,13 +16433,13 @@
+ for ac_func in setsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:14174: checking for $ac_func" >&5
++echo "configure:16436: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14180 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16442 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15705,17 +16468,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14208: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16473: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:14217: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16482: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15739,13 +16503,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:14237: result: yes" >&5
++	echo "configure:16506: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_setsockopt=no"
+ 	eval "LIB_setsockopt="
+-	echo "configure:14243: result: no" >&5
++	echo "configure:16512: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15759,7 +16523,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:14255: result: yes, in $ac_res" >&5
++	echo "configure:16526: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -15767,13 +16531,13 @@
+ for ac_func in getudbnam setlim
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:14262: checking for $ac_func" >&5
++echo "configure:16534: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14268 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16540 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15802,17 +16566,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14296: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:16571: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:14305: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16580: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15822,13 +16587,13 @@
+ fi
+ done
+ 
+-echo "configure:14313: checking return type of signal handlers" >&5
++echo "configure:16590: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14319 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16596 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -15848,17 +16613,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14339: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16618: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=void
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_signal=int
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14348: result: $ac_cv_type_signal" >&5
++echo "configure:16627: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -15873,7 +16639,7 @@
+ 
+ fi
+ 
+-echo "configure:14359: checking if realloc if broken" >&5
++echo "configure:16642: checking if realloc if broken" >&5
+ echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
+ if test "${ac_cv_func_realloc_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15883,8 +16649,8 @@
+ if test "$cross_compiling" = yes; then
+   :
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14369 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 16653 "configure"
+ #include "confdefs.h"
+ 
+ #include <stddef.h>
+@@ -15895,20 +16661,21 @@
+ 	return realloc(NULL, 17) == NULL;
+ }
+ 
+-EOF
+-if { (eval echo configure:14378: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:16666: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_realloc_broken=yes
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:14389: result: $ac_cv_func_realloc_broken" >&5
++echo "configure:16678: result: $ac_cv_func_realloc_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
+ if test "$ac_cv_func_realloc_broken" = yes ; then
+ 	
+@@ -15918,14 +16685,14 @@
+ 
+ fi
+ 
+-echo "configure:14397: checking for ut_addr in struct utmp" >&5
++echo "configure:16688: checking for ut_addr in struct utmp" >&5
+ echo $ECHO_N "checking for ut_addr in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_addr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14403 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16695 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15935,17 +16702,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14414: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16707: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_addr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_addr=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14423: result: $ac_cv_type_struct_utmp_ut_addr" >&5
++echo "configure:16716: result: $ac_cv_type_struct_utmp_ut_addr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_addr" >&6
+ if test "$ac_cv_type_struct_utmp_ut_addr" = yes; then
+ 	
+@@ -15957,14 +16725,14 @@
+ 	
+ fi
+ 
+-echo "configure:14433: checking for ut_host in struct utmp" >&5
++echo "configure:16728: checking for ut_host in struct utmp" >&5
+ echo $ECHO_N "checking for ut_host in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_host+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14439 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16735 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -15974,17 +16742,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14450: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16747: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_host=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_host=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14459: result: $ac_cv_type_struct_utmp_ut_host" >&5
++echo "configure:16756: result: $ac_cv_type_struct_utmp_ut_host" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_host" >&6
+ if test "$ac_cv_type_struct_utmp_ut_host" = yes; then
+ 	
+@@ -15996,14 +16765,14 @@
+ 	
+ fi
+ 
+-echo "configure:14469: checking for ut_id in struct utmp" >&5
++echo "configure:16768: checking for ut_id in struct utmp" >&5
+ echo $ECHO_N "checking for ut_id in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_id+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14475 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16775 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -16013,17 +16782,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14486: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16787: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_id=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_id=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14495: result: $ac_cv_type_struct_utmp_ut_id" >&5
++echo "configure:16796: result: $ac_cv_type_struct_utmp_ut_id" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_id" >&6
+ if test "$ac_cv_type_struct_utmp_ut_id" = yes; then
+ 	
+@@ -16035,14 +16805,14 @@
+ 	
+ fi
+ 
+-echo "configure:14505: checking for ut_pid in struct utmp" >&5
++echo "configure:16808: checking for ut_pid in struct utmp" >&5
+ echo $ECHO_N "checking for ut_pid in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_pid+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14511 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16815 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -16052,17 +16822,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14522: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16827: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_pid=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_pid=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14531: result: $ac_cv_type_struct_utmp_ut_pid" >&5
++echo "configure:16836: result: $ac_cv_type_struct_utmp_ut_pid" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_pid" >&6
+ if test "$ac_cv_type_struct_utmp_ut_pid" = yes; then
+ 	
+@@ -16074,14 +16845,14 @@
+ 	
+ fi
+ 
+-echo "configure:14541: checking for ut_type in struct utmp" >&5
++echo "configure:16848: checking for ut_type in struct utmp" >&5
+ echo $ECHO_N "checking for ut_type in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_type+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14547 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16855 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -16091,17 +16862,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14558: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16867: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_type=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_type=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14567: result: $ac_cv_type_struct_utmp_ut_type" >&5
++echo "configure:16876: result: $ac_cv_type_struct_utmp_ut_type" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_type" >&6
+ if test "$ac_cv_type_struct_utmp_ut_type" = yes; then
+ 	
+@@ -16113,14 +16885,14 @@
+ 	
+ fi
+ 
+-echo "configure:14577: checking for ut_user in struct utmp" >&5
++echo "configure:16888: checking for ut_user in struct utmp" >&5
+ echo $ECHO_N "checking for ut_user in struct utmp... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmp_ut_user+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14583 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16895 "configure"
+ #include "confdefs.h"
+ #include <utmp.h>
+ int
+@@ -16130,17 +16902,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14594: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16907: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmp_ut_user=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmp_ut_user=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14603: result: $ac_cv_type_struct_utmp_ut_user" >&5
++echo "configure:16916: result: $ac_cv_type_struct_utmp_ut_user" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmp_ut_user" >&6
+ if test "$ac_cv_type_struct_utmp_ut_user" = yes; then
+ 	
+@@ -16152,14 +16925,14 @@
+ 	
+ fi
+ 
+-echo "configure:14613: checking for ut_exit in struct utmpx" >&5
++echo "configure:16928: checking for ut_exit in struct utmpx" >&5
+ echo $ECHO_N "checking for ut_exit in struct utmpx... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmpx_ut_exit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14619 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16935 "configure"
+ #include "confdefs.h"
+ #include <utmpx.h>
+ int
+@@ -16169,17 +16942,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14630: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16947: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmpx_ut_exit=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmpx_ut_exit=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14639: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
++echo "configure:16956: result: $ac_cv_type_struct_utmpx_ut_exit" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_exit" >&6
+ if test "$ac_cv_type_struct_utmpx_ut_exit" = yes; then
+ 	
+@@ -16191,14 +16965,14 @@
+ 	
+ fi
+ 
+-echo "configure:14649: checking for ut_syslen in struct utmpx" >&5
++echo "configure:16968: checking for ut_syslen in struct utmpx" >&5
+ echo $ECHO_N "checking for ut_syslen in struct utmpx... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_utmpx_ut_syslen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14655 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 16975 "configure"
+ #include "confdefs.h"
+ #include <utmpx.h>
+ int
+@@ -16208,17 +16982,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14666: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:16987: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_utmpx_ut_syslen=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_utmpx_ut_syslen=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14675: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
++echo "configure:16996: result: $ac_cv_type_struct_utmpx_ut_syslen" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_utmpx_ut_syslen" >&6
+ if test "$ac_cv_type_struct_utmpx_ut_syslen" = yes; then
+ 	
+@@ -16230,14 +17005,14 @@
+ 	
+ fi
+ 
+-echo "configure:14685: checking for tm_gmtoff in struct tm" >&5
++echo "configure:17008: checking for tm_gmtoff in struct tm" >&5
+ echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14691 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17015 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -16247,17 +17022,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14702: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17027: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_gmtoff=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_gmtoff=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14711: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
++echo "configure:17036: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
+ if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
+ 	
+@@ -16269,14 +17045,14 @@
+ 	
+ fi
+ 
+-echo "configure:14721: checking for tm_zone in struct tm" >&5
++echo "configure:17048: checking for tm_zone in struct tm" >&5
+ echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14727 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17055 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -16286,17 +17062,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14738: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17067: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_zone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_tm_tm_zone=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14747: result: $ac_cv_type_struct_tm_tm_zone" >&5
++echo "configure:17076: result: $ac_cv_type_struct_tm_tm_zone" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
+ if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
+ 	
+@@ -16308,14 +17085,14 @@
+ 	
+ fi
+ 
+-echo "configure:14757: checking for timezone" >&5
++echo "configure:17088: checking for timezone" >&5
+ echo $ECHO_N "checking for timezone... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14763 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17095 "configure"
+ #include "confdefs.h"
+ extern int timezone;
+ int foo() { return timezone; }
+@@ -16326,20 +17103,21 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14775: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17108: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_timezone=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_var_timezone=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_timezone`
+-echo "configure:14785: result: $ac_foo" >&5
++echo "configure:17120: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+ 	
+@@ -16348,14 +17126,14 @@
+ EOF
+ 
+ 	
+-echo "configure:14793: checking if timezone is properly declared" >&5
++echo "configure:17129: checking if timezone is properly declared" >&5
+ echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 14799 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17136 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ extern struct { int foo; } timezone;
+@@ -16366,19 +17144,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14811: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17149: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_timezone_declaration=no"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_var_timezone_declaration=yes"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:14820: result: $ac_cv_var_timezone_declaration" >&5
++echo "configure:17160: result: $ac_cv_var_timezone_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
+ if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
+ 	
+@@ -16391,13 +17170,13 @@
+ fi
+ 
+ cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
+-echo "configure:14830: checking for sa_family_t" >&5
++echo "configure:17173: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14836 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17179 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16412,29 +17191,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14852: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17196: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14862: result: $ac_foo" >&5
++echo "configure:17206: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:14867: checking for sa_family_t" >&5
++	echo "configure:17211: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sa_family_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14873 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17217 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16447,17 +17227,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14887: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17232: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_sa_family_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_sa_family_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14896: result: $ac_cv_type_sa_family_t" >&5
++echo "configure:17241: result: $ac_cv_type_sa_family_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
+ if test $ac_cv_type_sa_family_t = yes; then
+ 
+@@ -16476,13 +17257,13 @@
+ fi
+ 
+ cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
+-echo "configure:14909: checking for socklen_t" >&5
++echo "configure:17260: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14915 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17266 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16497,29 +17278,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14931: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17283: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:14941: result: $ac_foo" >&5
++echo "configure:17293: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:14946: checking for socklen_t" >&5
++	echo "configure:17298: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if test "${ac_cv_type_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14952 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17304 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16532,17 +17314,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:14966: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17319: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_socklen_t=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_socklen_t=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:14975: result: $ac_cv_type_socklen_t" >&5
++echo "configure:17328: result: $ac_cv_type_socklen_t" >&5
+ echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+ if test $ac_cv_type_socklen_t = yes; then
+ 
+@@ -16561,13 +17344,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+-echo "configure:14988: checking for struct sockaddr" >&5
++echo "configure:17347: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 14994 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17353 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16582,29 +17365,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15010: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17370: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:15020: result: $ac_foo" >&5
++echo "configure:17380: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:15025: checking for struct sockaddr" >&5
++	echo "configure:17385: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15031 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17391 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16617,17 +17401,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15045: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17406: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:15054: result: $ac_cv_type_struct_sockaddr" >&5
++echo "configure:17415: result: $ac_cv_type_struct_sockaddr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
+ if test $ac_cv_type_struct_sockaddr = yes; then
+ 
+@@ -16646,13 +17431,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-echo "configure:15067: checking for struct sockaddr_storage" >&5
++echo "configure:17434: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15073 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17440 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16667,29 +17452,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15089: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17457: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:15099: result: $ac_foo" >&5
++echo "configure:17467: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:15104: checking for struct sockaddr_storage" >&5
++	echo "configure:17472: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15110 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17478 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16702,17 +17488,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15124: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17493: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_storage=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_storage=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:15133: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "configure:17502: result: $ac_cv_type_struct_sockaddr_storage" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
+ if test $ac_cv_type_struct_sockaddr_storage = yes; then
+ 
+@@ -16731,13 +17518,13 @@
+ fi
+ 
+ cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-echo "configure:15146: checking for struct addrinfo" >&5
++echo "configure:17521: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15152 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17527 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -16752,29 +17539,30 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15168: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17544: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_type_$cv=no"
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "configure:15178: result: $ac_foo" >&5
++echo "configure:17554: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "configure:15183: checking for struct addrinfo" >&5
++	echo "configure:17559: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_addrinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15189 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17565 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -16787,17 +17575,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15203: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17580: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_addrinfo=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_addrinfo=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:15212: result: $ac_cv_type_struct_addrinfo" >&5
++echo "configure:17589: result: $ac_cv_type_struct_addrinfo" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
+ if test $ac_cv_type_struct_addrinfo = yes; then
+ 
+@@ -16815,7 +17604,7 @@
+ 
+ fi
+ 
+-echo "configure:15224: checking for struct winsize" >&5
++echo "configure:17607: checking for struct winsize" >&5
+ echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
+ if test "${ac_cv_struct_winsize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16823,12 +17612,12 @@
+ 
+ ac_cv_struct_winsize=no
+ for i in sys/termios.h sys/ioctl.h; do
+-cat >conftest.$ac_ext <<EOF
+-#line 15232 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17616 "configure"
+ #include "confdefs.h"
+ #include <$i>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "struct[ 	]*winsize" >/dev/null 2>&1; then
+   ac_cv_struct_winsize=yes; break
+@@ -16845,14 +17634,14 @@
+ EOF
+ 
+ fi
+-echo "configure:15248: result: $ac_cv_struct_winsize" >&5
++echo "configure:17637: result: $ac_cv_struct_winsize" >&5
+ echo "${ECHO_T}$ac_cv_struct_winsize" >&6
+-cat >conftest.$ac_ext <<EOF
+-#line 15251 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17640 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_xpixel" >/dev/null 2>&1; then
+ 
+@@ -16863,12 +17652,12 @@
+ fi
+ rm -f conftest*
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 15263 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17656 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+-EOF
++_ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   egrep "ws_ypixel" >/dev/null 2>&1; then
+ 
+@@ -16879,14 +17668,14 @@
+ fi
+ rm -f conftest*
+ 
+-echo "configure:15274: checking for struct spwd" >&5
++echo "configure:17671: checking for struct spwd" >&5
+ echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
+ if test "${ac_cv_struct_spwd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 15280 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17678 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ #ifdef HAVE_SHADOW_H
+@@ -16899,19 +17688,20 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15294: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17693: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_spwd=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_struct_spwd=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "configure:15303: result: $ac_cv_struct_spwd" >&5
++echo "configure:17704: result: $ac_cv_struct_spwd" >&5
+ echo "${ECHO_T}$ac_cv_struct_spwd" >&6
+ 
+ if test "$ac_cv_struct_spwd" = "yes"; then
+@@ -16922,14 +17712,14 @@
+ 
+ fi
+ 
+-echo "configure:15310: checking for sa_len in struct sockaddr" >&5
++echo "configure:17715: checking for sa_len in struct sockaddr" >&5
+ echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-cat >conftest.$ac_ext <<EOF
+-#line 15316 "configure"
++cat >conftest.$ac_ext <<_ACEOF
++#line 17722 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -16940,17 +17730,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15328: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17735: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_sa_len=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_type_struct_sockaddr_sa_len=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:15337: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
++echo "configure:17744: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
+ if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
+ 	
+@@ -16965,14 +17756,14 @@
+ for i in int8_t int16_t int32_t int64_t \
+ 	u_int8_t u_int16_t u_int32_t u_int64_t \
+ 	uint8_t uint16_t uint32_t uint64_t; do
+-	echo "configure:15350: checking for $i" >&5
++	echo "configure:17759: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ 	
+ if eval "test \"\${ac_cv_type_$i+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15357 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17766 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_INTTYPES_H
+@@ -16999,15 +17790,16 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15382: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:17795: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval ac_cv_type_$i=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval ac_cv_type_$i=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+ 	eval ac_res=\$ac_cv_type_$i
+@@ -17018,11 +17810,17 @@
+ EOF
+ 
+ 	fi
+-	echo "configure:15398: result: $ac_res" >&5
++	echo "configure:17813: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6
+ done
+ 
+-echo "configure:15401: checking for MD4Init" >&5
++if test "$with_krb4" != "no"; then
++  DESLIBS="crypto des"
++else
++  DESLIBS="crypto"
++fi
++
++echo "configure:17823: checking for MD4Init" >&5
+ echo $ECHO_N "checking for MD4Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD4Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17030,15 +17828,15 @@
+ 
+ if eval "test \"\$ac_cv_func_MD4Init\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15416 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 17839 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17048,14 +17846,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15426: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17851: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD4Init=$ac_lib; else ac_cv_funclib_MD4Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD4Init=\${ac_cv_funclib_MD4Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17070,13 +17869,13 @@
+ for ac_func in MD4Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15444: checking for $ac_func" >&5
++echo "configure:17872: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15450 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 17878 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17105,17 +17904,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15478: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17909: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15487: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:17918: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17139,13 +17939,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15507: result: yes" >&5
++	echo "configure:17942: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD4Init=no"
+ 	eval "LIB_MD4Init="
+-	echo "configure:15513: result: no" >&5
++	echo "configure:17948: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17159,12 +17959,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15525: result: yes, in $ac_res" >&5
++	echo "configure:17962: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15529: checking for MD4_Init" >&5
++echo "configure:17967: checking for MD4_Init" >&5
+ echo $ECHO_N "checking for MD4_Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD4_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17172,15 +17972,15 @@
+ 
+ if eval "test \"\$ac_cv_func_MD4_Init\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15544 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 17983 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17190,14 +17990,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15554: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:17995: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD4_Init=$ac_lib; else ac_cv_funclib_MD4_Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD4_Init=\${ac_cv_funclib_MD4_Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17212,13 +18013,13 @@
+ for ac_func in MD4_Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15572: checking for $ac_func" >&5
++echo "configure:18016: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15578 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18022 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17247,17 +18048,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15606: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18053: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15615: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18062: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17281,13 +18083,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15635: result: yes" >&5
++	echo "configure:18086: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD4_Init=no"
+ 	eval "LIB_MD4_Init="
+-	echo "configure:15641: result: no" >&5
++	echo "configure:18092: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17301,12 +18103,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15653: result: yes, in $ac_res" >&5
++	echo "configure:18106: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15657: checking for MD5Init" >&5
++echo "configure:18111: checking for MD5Init" >&5
+ echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD5Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17314,15 +18116,15 @@
+ 
+ if eval "test \"\$ac_cv_func_MD5Init\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15672 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18127 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17332,14 +18134,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15682: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18139: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD5Init=$ac_lib; else ac_cv_funclib_MD5Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD5Init=\${ac_cv_funclib_MD5Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17354,13 +18157,13 @@
+ for ac_func in MD5Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15700: checking for $ac_func" >&5
++echo "configure:18160: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15706 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18166 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17389,17 +18192,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15734: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18197: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15743: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18206: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17423,13 +18227,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15763: result: yes" >&5
++	echo "configure:18230: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD5Init=no"
+ 	eval "LIB_MD5Init="
+-	echo "configure:15769: result: no" >&5
++	echo "configure:18236: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17443,12 +18247,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15781: result: yes, in $ac_res" >&5
++	echo "configure:18250: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15785: checking for MD5_Init" >&5
++echo "configure:18255: checking for MD5_Init" >&5
+ echo $ECHO_N "checking for MD5_Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_MD5_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17456,15 +18260,15 @@
+ 
+ if eval "test \"\$ac_cv_func_MD5_Init\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15800 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18271 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17474,14 +18278,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15810: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18283: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_MD5_Init=$ac_lib; else ac_cv_funclib_MD5_Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_MD5_Init=\${ac_cv_funclib_MD5_Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17496,13 +18301,13 @@
+ for ac_func in MD5_Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15828: checking for $ac_func" >&5
++echo "configure:18304: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15834 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18310 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17531,17 +18336,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15862: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18341: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15871: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18350: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17565,13 +18371,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:15891: result: yes" >&5
++	echo "configure:18374: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_MD5_Init=no"
+ 	eval "LIB_MD5_Init="
+-	echo "configure:15897: result: no" >&5
++	echo "configure:18380: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17585,12 +18391,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:15909: result: yes, in $ac_res" >&5
++	echo "configure:18394: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:15913: checking for SHA1Init" >&5
++echo "configure:18399: checking for SHA1Init" >&5
+ echo $ECHO_N "checking for SHA1Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_SHA1Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17598,15 +18404,15 @@
+ 
+ if eval "test \"\$ac_cv_func_SHA1Init\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 15928 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18415 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17616,14 +18422,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15938: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18427: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_SHA1Init=$ac_lib; else ac_cv_funclib_SHA1Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_SHA1Init=\${ac_cv_funclib_SHA1Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17638,13 +18445,13 @@
+ for ac_func in SHA1Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:15956: checking for $ac_func" >&5
++echo "configure:18448: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 15962 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18454 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17673,17 +18480,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:15990: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18485: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:15999: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18494: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17707,13 +18515,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16019: result: yes" >&5
++	echo "configure:18518: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_SHA1Init=no"
+ 	eval "LIB_SHA1Init="
+-	echo "configure:16025: result: no" >&5
++	echo "configure:18524: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17727,12 +18535,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16037: result: yes, in $ac_res" >&5
++	echo "configure:18538: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:16041: checking for SHA1_Init" >&5
++echo "configure:18543: checking for SHA1_Init" >&5
+ echo $ECHO_N "checking for SHA1_Init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_SHA1_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17740,15 +18548,15 @@
+ 
+ if eval "test \"\$ac_cv_func_SHA1_Init\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 16056 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18559 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17758,14 +18566,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16066: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18571: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_SHA1_Init=$ac_lib; else ac_cv_funclib_SHA1_Init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_SHA1_Init=\${ac_cv_funclib_SHA1_Init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17780,13 +18589,13 @@
+ for ac_func in SHA1_Init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:16084: checking for $ac_func" >&5
++echo "configure:18592: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16090 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18598 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17815,17 +18624,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16118: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18629: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16127: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18638: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17849,13 +18659,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16147: result: yes" >&5
++	echo "configure:18662: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_SHA1_Init=no"
+ 	eval "LIB_SHA1_Init="
+-	echo "configure:16153: result: no" >&5
++	echo "configure:18668: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -17869,12 +18679,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16165: result: yes, in $ac_res" >&5
++	echo "configure:18682: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:16169: checking for des_cbc_encrypt" >&5
++echo "configure:18687: checking for des_cbc_encrypt" >&5
+ echo $ECHO_N "checking for des_cbc_encrypt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_des_cbc_encrypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17882,15 +18692,15 @@
+ 
+ if eval "test \"\$ac_cv_func_des_cbc_encrypt\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 16184 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18703 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -17900,14 +18710,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16194: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18715: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_des_cbc_encrypt=$ac_lib; else ac_cv_funclib_des_cbc_encrypt=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_des_cbc_encrypt=\${ac_cv_funclib_des_cbc_encrypt-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -17922,13 +18733,13 @@
+ for ac_func in des_cbc_encrypt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:16212: checking for $ac_func" >&5
++echo "configure:18736: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16218 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18742 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -17957,17 +18768,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16246: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18773: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16255: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18782: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -17991,13 +18803,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16275: result: yes" >&5
++	echo "configure:18806: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_des_cbc_encrypt=no"
+ 	eval "LIB_des_cbc_encrypt="
+-	echo "configure:16281: result: no" >&5
++	echo "configure:18812: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -18011,12 +18823,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16293: result: yes, in $ac_res" >&5
++	echo "configure:18826: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "configure:16297: checking for RC4" >&5
++echo "configure:18831: checking for RC4" >&5
+ echo $ECHO_N "checking for RC4... $ECHO_C" >&6
+ if test "${ac_cv_funclib_RC4+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18024,15 +18836,15 @@
+ 
+ if eval "test \"\$ac_cv_func_RC4\" != yes" ; then
+ 	ac_save_LIBS="$LIBS"
+-	for ac_lib in crypto des; do
++	for ac_lib in $DESLIBS; do
+ 		if test -n "$ac_lib"; then
+ 			ac_lib="-l$ac_lib"
+ 		else
+ 			ac_lib=""
+ 		fi
+ 		LIBS="$LIB_krb4 $ac_lib  $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 16312 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 18847 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18042,14 +18854,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16322: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18859: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_RC4=$ac_lib; else ac_cv_funclib_RC4=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_RC4=\${ac_cv_funclib_RC4-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -18064,13 +18877,13 @@
+ for ac_func in RC4
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:16340: checking for $ac_func" >&5
++echo "configure:18880: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16346 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 18886 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -18099,17 +18912,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16374: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:18917: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16383: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18926: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -18133,13 +18947,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16403: result: yes" >&5
++	echo "configure:18950: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_RC4=no"
+ 	eval "LIB_RC4="
+-	echo "configure:16409: result: no" >&5
++	echo "configure:18956: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -18153,7 +18967,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16421: result: yes, in $ac_res" >&5
++	echo "configure:18970: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -18164,13 +18978,21 @@
+ \( "$ac_cv_func_SHA1Init" = "yes" -o "$ac_cv_func_SHA1_Init" = "yes" \) -a \
+ "$ac_cv_func_RC4" = "yes"; then
+   DIR_des=''
+-  LIB_des="-rpath $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4Init"
++  LIB_des=''
++  if test "$krb4_libdir" != ""; then
++    LIB_des="-rpath $krb4_libdir -L$krb4_libdir"
++  fi
++  if test "$ac_cv_func_MD4Init" = "yes"; then
++    LIB_des="$LIB_des $ac_cv_funclib_MD4Init"
++  else
++    LIB_des="$LIB_des $ac_cv_funclib_MD4_Init"
++  fi
+ else
+   DIR_des='des'
+   LIB_des='$(top_builddir)/lib/des/libdes.la'
+ fi
+ 
+-echo "configure:16436: checking for el_init" >&5
++echo "configure:18995: checking for el_init" >&5
+ echo $ECHO_N "checking for el_init... $ECHO_C" >&6
+ if test "${ac_cv_funclib_el_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18185,8 +19007,8 @@
+ 			ac_lib=""
+ 		fi
+ 		LIBS=" $ac_lib $LIB_tgetent $ac_save_LIBS"
+-		cat >conftest.$ac_ext <<EOF
+-#line 16451 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 19011 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -18196,14 +19018,15 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16461: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:19023: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_el_init=$ac_lib; else ac_cv_funclib_el_init=yes; fi";break
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+ 	eval "ac_cv_funclib_el_init=\${ac_cv_funclib_el_init-no}"
+ 	LIBS="$ac_save_LIBS"
+@@ -18218,13 +19041,13 @@
+ for ac_func in el_init
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "configure:16479: checking for $ac_func" >&5
++echo "configure:19044: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16485 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 19050 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -18253,17 +19076,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16513: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:19081: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_var=no"
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16522: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:19090: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -18287,13 +19111,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "configure:16542: result: yes" >&5
++	echo "configure:19114: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_el_init=no"
+ 	eval "LIB_el_init="
+-	echo "configure:16548: result: no" >&5
++	echo "configure:19120: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -18307,20 +19131,20 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "configure:16560: result: yes, in $ac_res" >&5
++	echo "configure:19134: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ if test "$ac_cv_func_el_init" = yes ; then
+-	echo "configure:16565: checking for four argument el_init" >&5
++	echo "configure:19140: checking for four argument el_init" >&5
+ echo $ECHO_N "checking for four argument el_init... $ECHO_C" >&6
+ if test "${ac_cv_func_el_init_four+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-		cat >conftest.$ac_ext <<EOF
+-#line 16571 "configure"
++		cat >conftest.$ac_ext <<_ACEOF
++#line 19147 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ 			#include <histedit.h>
+@@ -18331,17 +19155,18 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16583: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:19160: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_el_init_four=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_el_init_four=no
+ fi
+-rm -f conftest*
++rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "configure:16592: result: $ac_cv_func_el_init_four" >&5
++echo "configure:19169: result: $ac_cv_func_el_init_four" >&5
+ echo "${ECHO_T}$ac_cv_func_el_init_four" >&6
+ 	if test "$ac_cv_func_el_init_four" = yes; then
+ 		
+@@ -18359,8 +19184,10 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init"
+ else
++	DIR_readline="editline"
+ 	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ 
+@@ -18371,15 +19198,66 @@
+   el_compat_TRUE='#'
+   el_compat_FALSE=
+ fi
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ 
+ cat >>confdefs.h <<\EOF
+ #define HAVE_READLINE 1
+ EOF
+ 
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++
++cat >>confdefs.h <<\EOF
++#define HAVE_COM_ERR 1
++EOF
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++cat >>confdefs.h <<\EOF
++#define HAVE_SS 1
++EOF
++
+ cat >>confdefs.h <<\EOF
+ #define AUTHENTICATION 1
+ EOF
+@@ -18412,13 +19290,13 @@
+ #
+ # And also something wierd has happend with dec-osf1, fallback to bsd-ptys
+ 
+-echo "configure:16650: checking for getmsg" >&5
++echo "configure:19293: checking for getmsg" >&5
+ echo $ECHO_N "checking for getmsg... $ECHO_C" >&6
+ if test "${ac_cv_func_getmsg+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16656 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 19299 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getmsg (); below.  */
+@@ -18447,22 +19325,23 @@
+   ;
+   return 0;
+ }
+-EOF
+-if { (eval echo configure:16684: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:19330: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_getmsg=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getmsg=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "configure:16693: result: $ac_cv_func_getmsg" >&5
++echo "configure:19339: result: $ac_cv_func_getmsg" >&5
+ echo "${ECHO_T}$ac_cv_func_getmsg" >&6
+ 
+ if test "$ac_cv_func_getmsg" = "yes"; then
+ 
+-echo "configure:16696: checking for working getmsg" >&5
++echo "configure:19344: checking for working getmsg" >&5
+ echo $ECHO_N "checking for working getmsg... $ECHO_C" >&6
+ if test "${ac_cv_func_getmsg_work+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18470,8 +19349,8 @@
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_getmsg_work=no
+ else
+-  cat >conftest.$ac_ext <<EOF
+-#line 16705 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 19353 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -18486,20 +19365,21 @@
+   return 0;
+ }
+ 
+-EOF
+-if { (eval echo configure:16718: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
+-   test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo configure:19370: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   ac_cv_func_getmsg_work=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_func_getmsg_work=no
+ fi
+-rm -f conftest*
++rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "configure:16729: result: $ac_cv_func_getmsg_work" >&5
++echo "configure:19382: result: $ac_cv_func_getmsg_work" >&5
+ echo "${ECHO_T}$ac_cv_func_getmsg_work" >&6
+ test "$ac_cv_func_getmsg_work" = "yes" &&
+ 
+@@ -18510,7 +19390,7 @@
+ fi
+ 
+ if test "$ac_cv_func_getmsg_work" = yes; then
+-echo "configure:16737: checking for streamspty" >&5
++echo "configure:19393: checking for streamspty" >&5
+ echo $ECHO_N "checking for streamspty... $ECHO_C" >&6
+ case "$host" in
+ *-*-aix3*|*-*-sunos4*|*-*-osf*|*-*-hpux1[01]*)
+@@ -18520,7 +19400,7 @@
+ 	krb_cv_sys_streamspty=yes
+ 	;;
+ esac
+-echo "configure:16747: result: $krb_cv_sys_streamspty" >&5
++echo "configure:19403: result: $krb_cv_sys_streamspty" >&5
+ echo "${ECHO_T}$krb_cv_sys_streamspty" >&6
+ fi
+ if test "$krb_cv_sys_streamspty" = yes; then
+@@ -18531,7 +19411,7 @@
+ 
+ fi
+ 
+-echo "configure:16756: checking which authentication modules should be built" >&5
++echo "configure:19414: checking which authentication modules should be built" >&5
+ echo $ECHO_N "checking which authentication modules should be built... $ECHO_C" >&6
+ 
+ LIB_AUTH_SUBDIRS=
+@@ -18548,7 +19428,7 @@
+ *-*-irix[56]*) LIB_AUTH_SUBDIRS="$LIB_AUTH_SUBDIRS afskauthlib" ;;
+ esac
+ 
+-echo "configure:16768: result: $LIB_AUTH_SUBDIRS" >&5
++echo "configure:19431: result: $LIB_AUTH_SUBDIRS" >&5
+ echo "${ECHO_T}$LIB_AUTH_SUBDIRS" >&6
+ 
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+@@ -18632,18 +19512,17 @@
+ cat >confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+-# scripts and configure runs.  It is not useful on other systems.
+-# If it contains results you don't want to keep, you may remove or edit it.
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
+ #
+-# By default, configure uses `config.cache' as the cache file,
+-# creating it if it does not exist already.  You can give configure
+-# the --cache-file=FILE option to use a different cache file; that is
+-# what configure does when it calls configure scripts in
+-# subdirectories, so they share the cache.
+-# Giving --cache-file=/dev/null disables caching, for debugging configure.
+-# config.status only pays attention to the cache file if you give it the
+-# --recheck option to rerun configure.
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
+ #
++# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
+ EOF
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+@@ -18666,7 +19545,7 @@
+       ;;
+     esac;
+ } |
+-  sed 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
++  sed '/^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
+ if cmp -s $cache_file confcache; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+@@ -18729,6 +19608,40 @@
+ # Compiler output produced by configure, useful for debugging
+ # configure, is in ./config.log if it exists.
+ 
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++
++# Support unset when possible.
++if (unset FOO) >/dev/null 2>&1; then
++  ac_unset=unset
++else
++  ac_unset=false
++fi
++
++# NLS nuisances.
++$ac_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
++$ac_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
++$ac_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
++$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
++$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
++$ac_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
++$ac_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
++$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++ac_nl='
++'
++IFS=" 	$ac_nl"
++
++# CDPATH.
++$ac_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
++
+ debug=false
+ me=`echo "$0" | sed 's,.*/,,'`
+ SHELL=${CONFIG_SHELL-/bin/sh}
+@@ -18758,7 +19671,7 @@
+ \`$me' instantiates files from templates according to the
+ current configuration.
+ 
+-Usage: $0 [OPTIONS] FILE...
++Usage: $0 [OPTIONS] [FILE]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
+@@ -18783,7 +19696,7 @@
+ 
+ cat >>$CONFIG_STATUS <<EOF
+ ac_cs_version="\\
+-$CONFIG_STATUS generated by autoconf version 2.14a.
++$CONFIG_STATUS generated by autoconf version 2.49b.
+ Configured on host `(hostname || uname -n) 2>/dev/null | sed 1q` by
+   `echo "$0 $ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`"
+ 
+@@ -18928,7 +19841,8 @@
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=$TMPDIR/cs$$-$RANDOM && (umask 077 && mkdir $tmp)
++  tmp=$TMPDIR/cs$$-$RANDOM
++  (umask 077 && mkdir $tmp)
+ } ||
+ {
+    echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+@@ -18942,6 +19856,15 @@
+ # INIT-COMMANDS section.
+ #
+ 
++am_indx=1
++  for am_file in include/config.h; do
++    case " $CONFIG_HEADERS " in
++    *" $am_file "*)
++      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
++      ;;
++    esac
++    am_indx=\`expr \$am_indx + 1\`
++  done
+ AMDEP="$AMDEP"
+ ac_aux_dir="$ac_aux_dir"
+ 
+@@ -18959,6 +19882,8 @@
+   # Protect against being on the right side of a sed subst in config.status.
+   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@COMPILE_ET@,$COMPILE_ET,;t t
++s,@LIB_sl@,$LIB_sl,;t t
+ s,@SHELL@,$SHELL,;t t
+ s,@exec_prefix@,$exec_prefix,;t t
+ s,@prefix@,$prefix,;t t
+@@ -18987,8 +19912,8 @@
+ s,@LIBS@,$LIBS,;t t
+ s,@CC@,$CC,;t t
+ s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+ s,@OBJEXT@,$OBJEXT,;t t
++s,@EXEEXT@,$EXEEXT,;t t
+ s,@CPP@,$CPP,;t t
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+@@ -19022,10 +19947,8 @@
+ s,@LEXLIB@,$LEXLIB,;t t
+ s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
+ s,@RANLIB@,$RANLIB,;t t
+-s,@LN_S@,$LN_S,;t t
+ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@STRIP@,$STRIP,;t t
+-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@LN_S@,$LN_S,;t t
+ s,@LIBTOOL@,$LIBTOOL,;t t
+ s,@WFLAGS@,$WFLAGS,;t t
+ s,@WFLAGS_NOUNUSED@,$WFLAGS_NOUNUSED,;t t
+@@ -19060,8 +19983,10 @@
+ s,@DIR_roken@,$DIR_roken,;t t
+ s,@LIB_roken@,$LIB_roken,;t t
+ s,@INCLUDES_roken@,$INCLUDES_roken,;t t
++s,@DIR_openldap@,$DIR_openldap,;t t
+ s,@INCLUDE_openldap@,$INCLUDE_openldap,;t t
+ s,@LIB_openldap@,$LIB_openldap,;t t
++s,@DIR_krb4@,$DIR_krb4,;t t
+ s,@INCLUDE_krb4@,$INCLUDE_krb4,;t t
+ s,@LIB_krb4@,$LIB_krb4,;t t
+ s,@EXTRA_LIB45@,$EXTRA_LIB45,;t t
+@@ -19089,8 +20014,16 @@
+ s,@CATMAN_TRUE@,$CATMAN_TRUE,;t t
+ s,@CATMAN_FALSE@,$CATMAN_FALSE,;t t
+ s,@CATMANEXT@,$CATMANEXT,;t t
++s,@DIR_readline@,$DIR_readline,;t t
+ s,@INCLUDE_readline@,$INCLUDE_readline,;t t
+ s,@LIB_readline@,$LIB_readline,;t t
++s,@DIR_com_err@,$DIR_com_err,;t t
++s,@INCLUDE_com_err@,$INCLUDE_com_err,;t t
++s,@LIB_com_err@,$LIB_com_err,;t t
++s,@DIR_ss@,$DIR_ss,;t t
++s,@INCLUDE_ss@,$INCLUDE_ss,;t t
++s,@LIB_ss@,$LIB_ss,;t t
++s,@DIR_hesiod@,$DIR_hesiod,;t t
+ s,@INCLUDE_hesiod@,$INCLUDE_hesiod,;t t
+ s,@LIB_hesiod@,$LIB_hesiod,;t t
+ s,@AIX_TRUE@,$AIX_TRUE,;t t
+@@ -19196,7 +20129,13 @@
+       X"$ac_file" : 'X\(//\)[^/]' \| \
+       X"$ac_file" : 'X\(//\)$' \| \
+       X"$ac_file" : 'X\(/\)' \| \
+-      .   : '\(.\)'`
++      .   : '\(.\)' 2>/dev/null ||
++echo "X"$ac_file"" | sed '
++	    /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
++	    /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
++	    /^X\(\/\/\)$/{ s//\1/p; q; }
++	    /^X\(\/\).*/{ s//\1/p; q; }
++	    s/.*/./p; q'`
+   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+     { case "$ac_dir" in
+   [\\/]* | ?:[\\/]* ) ac_incr_dir=;;
+@@ -19264,7 +20203,7 @@
+            { echo "configure: error: cannot find input file \\\`$f'" >&2; exit 1; }
+          fi;;
+       esac
+-    done`
++    done` || { (exit 1); exit; }
+ EOF
+ cat >>$CONFIG_STATUS <<EOF
+   sed "$ac_vpsub
+@@ -19344,7 +20283,7 @@
+            { echo "configure: error: cannot find input file \\\`$f'" >&2; exit 1; }
+          fi;;
+       esac
+-    done`
++    done` || { (exit 1); exit; }
+   # Remove the trailing spaces.
+   sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
+ 
+@@ -19460,7 +20399,13 @@
+       X"$ac_file" : 'X\(//\)[^/]' \| \
+       X"$ac_file" : 'X\(//\)$' \| \
+       X"$ac_file" : 'X\(/\)' \| \
+-      .   : '\(.\)'`
++      .   : '\(.\)' 2>/dev/null ||
++echo "X"$ac_file"" | sed '
++	    /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/p; q; }
++	    /^X\(\/\/\)[^/].*/{ s//\1/p; q; }
++	    /^X\(\/\/\)$/{ s//\1/p; q; }
++	    /^X\(\/\).*/{ s//\1/p; q; }
++	    s/.*/./p; q'`
+       if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+         { case "$ac_dir" in
+   [\\/]* | ?:[\\/]* ) ac_incr_dir=;;
+@@ -19492,7 +20437,7 @@
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ 
+   case $ac_dest in
+-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h ;;
++    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp >	   include/stamp-h ;;
+     default-2 )
+ test x"$AMDEP" != x"" ||
+ for mf in $CONFIG_FILES; do
+diff -ruN heimdal-0.3d-old/doc/Makefile.in heimdal-0.3d/doc/Makefile.in
+--- heimdal-0.3d-old/doc/Makefile.in	Mon Dec 11 14:20:09 2000
++++ heimdal-0.3d/doc/Makefile.in	Tue Jan  9 10:36:55 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/include/Makefile.in heimdal-0.3d/include/Makefile.in
+--- heimdal-0.3d-old/include/Makefile.in	Mon Dec 11 14:19:43 2000
++++ heimdal-0.3d/include/Makefile.in	Tue Jan  9 10:36:41 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -400,10 +410,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3d-old/include/config.h.in heimdal-0.3d/include/config.h.in
+--- heimdal-0.3d-old/include/config.h.in	Mon Dec 11 14:23:03 2000
++++ heimdal-0.3d/include/config.h.in	Tue Jan  9 10:36:39 2001
+@@ -30,6 +30,9 @@
+ /* Define if realloc(NULL) doesn't work. */
+ #undef BROKEN_REALLOC
+ 
++/* Define if you have the com_err package. */
++#undef COM_ERR
++
+ /* Define if you want support for DCE/DFS PAG's. */
+ #undef DCE
+ 
+@@ -100,6 +103,9 @@
+ /* Define if you have the `chown' function. */
+ #undef HAVE_CHOWN
+ 
++/* Define if you have a com_err compatible library. */
++#undef HAVE_COM_ERR
++
+ /* Define if you have the <config.h> header file. */
+ #undef HAVE_CONFIG_H
+ 
+@@ -350,36 +356,6 @@
+ /* 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 `bsd' library (-lbsd). */
+-#undef HAVE_LIBBSD
+-
+-/* Define if you have the `dnet' library (-ldnet). */
+-#undef HAVE_LIBDNET
+-
+-/* Define if you have the `dnet_stub' library (-ldnet_stub). */
+-#undef HAVE_LIBDNET_STUB
+-
+-/* Define if you have the `fl' library (-lfl). */
+-#undef HAVE_LIBFL
+-
+-/* Define if you have the `ICE' library (-lICE). */
+-#undef HAVE_LIBICE
+-
+-/* Define if you have the `ipc' library (-lipc). */
+-#undef HAVE_LIBIPC
+-
+-/* Define if you have the `l' library (-ll). */
+-#undef HAVE_LIBL
+-
+-/* Define if you have the `nsl' library (-lnsl). */
+-#undef HAVE_LIBNSL
+-
+-/* Define if you have the `posix' library (-lposix). */
+-#undef HAVE_LIBPOSIX
+-
+-/* Define if you have the `socket' library (-lsocket). */
+-#undef HAVE_LIBSOCKET
+-
+ /* Define if you have the <limits.h> header file. */
+ #undef HAVE_LIMITS_H
+ 
+@@ -458,6 +434,9 @@
+ /* Define if you have the <net/if.h> header file. */
+ #undef HAVE_NET_IF_H
+ 
++/* Define if you have the <openssl/crypto.h> header file. */
++#undef HAVE_OPENSSL_CRYPTO_H
++
+ /* define if your system declares optarg */
+ #undef HAVE_OPTARG_DECLARATION
+ 
+@@ -626,6 +605,9 @@
+ /* Define if the system has the type `socklen_t'. */
+ #undef HAVE_SOCKLEN_T
+ 
++/* Define if you have a ss compatible library. */
++#undef HAVE_SS
++
+ /* Define if you have the <standards.h> header file. */
+ #undef HAVE_STANDARDS_H
+ 
+@@ -1112,6 +1094,9 @@
+ 
+ /* Define as the return type of signal handlers (`int' or `void'). */
+ #undef RETSIGTYPE
++
++/* Define if you have the ss package. */
++#undef SS
+ 
+ /* Define if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+diff -ruN heimdal-0.3d-old/include/kadm5/Makefile.in heimdal-0.3d/include/kadm5/Makefile.in
+--- heimdal-0.3d-old/include/kadm5/Makefile.in	Mon Dec 11 14:19:44 2000
++++ heimdal-0.3d/include/kadm5/Makefile.in	Tue Jan  9 10:36:41 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/kadmin/Makefile.in heimdal-0.3d/kadmin/Makefile.in
+--- heimdal-0.3d-old/kadmin/Makefile.in	Mon Dec 11 14:19:57 2000
++++ heimdal-0.3d/kadmin/Makefile.in	Tue Jan  9 10:36:48 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -125,13 +128,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline) $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_ss) -I$(srcdir)/../lib/krb5
+ 
+ AM_CFLAGS =  $(WFLAGS)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -246,7 +256,7 @@
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(COMMON_LDADD) \
+ 	$(LIB_dlopen)
+@@ -290,8 +300,8 @@
+ kadmin_OBJECTS =  $(am_kadmin_OBJECTS)
+ kadmin_DEPENDENCIES =  $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ $(top_builddir)/lib/kadm5/libkadm5srv.la \
+-$(top_builddir)/lib/sl/libsl.la $(top_builddir)/lib/hdb/libhdb.la \
+-$(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/asn1/libasn1.la
++$(top_builddir)/lib/hdb/libhdb.la $(top_builddir)/lib/krb5/libkrb5.la \
++$(top_builddir)/lib/asn1/libasn1.la
+ kadmin_LDFLAGS = 
+ @KRB4_FALSE@am_kadmind_OBJECTS =  kadmind.$(OBJEXT) server.$(OBJEXT) \
+ @KRB4_FALSE@kadm_conn.$(OBJEXT)
+diff -ruN heimdal-0.3d-old/kdc/Makefile.in heimdal-0.3d/kdc/Makefile.in
+--- heimdal-0.3d-old/kdc/Makefile.in	Mon Dec 11 14:19:58 2000
++++ heimdal-0.3d/kdc/Makefile.in	Tue Jan  9 10:36:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/kpasswd/Makefile.in heimdal-0.3d/kpasswd/Makefile.in
+--- heimdal-0.3d-old/kpasswd/Makefile.in	Mon Dec 11 14:19:57 2000
++++ heimdal-0.3d/kpasswd/Makefile.in	Tue Jan  9 10:36:48 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/kuser/Makefile.in heimdal-0.3d/kuser/Makefile.in
+--- heimdal-0.3d-old/kuser/Makefile.in	Mon Dec 11 14:19:56 2000
++++ heimdal-0.3d/kuser/Makefile.in	Tue Jan  9 10:36:47 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/45/Makefile.in heimdal-0.3d/lib/45/Makefile.in
+--- heimdal-0.3d-old/lib/45/Makefile.in	Mon Dec 11 14:19:44 2000
++++ heimdal-0.3d/lib/45/Makefile.in	Tue Jan  9 10:36:41 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/Makefile.in heimdal-0.3d/lib/Makefile.in
+--- heimdal-0.3d-old/lib/Makefile.in	Mon Dec 11 14:19:44 2000
++++ heimdal-0.3d/lib/Makefile.in	Tue Jan  9 10:36:41 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -190,7 +200,7 @@
+ @OTP_TRUE@dir_otp = @OTP_TRUE@otp
+ @DCE_TRUE@dir_dce = @DCE_TRUE@kdfs
+ 
+-SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 @DIR_des@ krb5 \
++SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ asn1 @DIR_des@ krb5 \
+ 	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+ 
+ subdir = lib
+@@ -210,8 +220,8 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ 
+ GZIP_ENV = --best
+-DIST_SUBDIRS =  @DIR_roken@ vers editline com_err sl asn1 @DIR_des@ krb5 \
+-kafs hdb kadm5 gssapi auth 45 otp kdfs
++DIST_SUBDIRS =  @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ \
++asn1 @DIR_des@ krb5 kafs hdb kadm5 gssapi auth 45 otp kdfs
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .et .h .x
+@@ -256,10 +266,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3d-old/lib/asn1/Makefile.in heimdal-0.3d/lib/asn1/Makefile.in
+--- heimdal-0.3d-old/lib/asn1/Makefile.in	Mon Dec 11 14:19:48 2000
++++ heimdal-0.3d/lib/asn1/Makefile.in	Tue Jan  9 10:36:42 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -125,13 +128,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken)
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_com_err)
+ 
+ AM_CFLAGS =  $(WFLAGS)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -270,12 +280,12 @@
+ 
+ 
+ asn1_compile_LDADD = \
+-	$(LIB_roken) $(LEXLIB)
++        $(LIB_roken) $(LEXLIB)
+ 
+ 
+ check_der_LDADD = \
+ 	libasn1.la \
+-	../com_err/libcom_err.la \
++	$(LIB_com_err) \
+ 	$(LIB_roken)
+ 
+ 
+@@ -334,11 +344,11 @@
+ asn1_compile_LDFLAGS = 
+ asn1_print_SOURCES = asn1_print.c
+ asn1_print_OBJECTS =  asn1_print.$(OBJEXT)
+-asn1_print_DEPENDENCIES =  libasn1.la ../com_err/libcom_err.la
++asn1_print_DEPENDENCIES =  libasn1.la
+ asn1_print_LDFLAGS = 
+ check_der_SOURCES = check-der.c
+ check_der_OBJECTS =  check-der.$(OBJEXT)
+-check_der_DEPENDENCIES =  libasn1.la ../com_err/libcom_err.la
++check_der_DEPENDENCIES =  libasn1.la
+ check_der_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3d-old/lib/auth/Makefile.in heimdal-0.3d/lib/auth/Makefile.in
+--- heimdal-0.3d-old/lib/auth/Makefile.in	Mon Dec 11 14:19:45 2000
++++ heimdal-0.3d/lib/auth/Makefile.in	Tue Jan  9 10:36:41 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -249,10 +259,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3d-old/lib/auth/afskauthlib/Makefile.in heimdal-0.3d/lib/auth/afskauthlib/Makefile.in
+--- heimdal-0.3d-old/lib/auth/afskauthlib/Makefile.in	Mon Dec 11 14:19:45 2000
++++ heimdal-0.3d/lib/auth/afskauthlib/Makefile.in	Tue Jan  9 10:36:42 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/auth/pam/Makefile.in heimdal-0.3d/lib/auth/pam/Makefile.in
+--- heimdal-0.3d-old/lib/auth/pam/Makefile.in	Mon Dec 11 14:19:45 2000
++++ heimdal-0.3d/lib/auth/pam/Makefile.in	Tue Jan  9 10:36:42 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/auth/sia/Makefile.in heimdal-0.3d/lib/auth/sia/Makefile.in
+--- heimdal-0.3d-old/lib/auth/sia/Makefile.in	Mon Dec 11 14:19:46 2000
++++ heimdal-0.3d/lib/auth/sia/Makefile.in	Tue Jan  9 10:36:42 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS_NOIMPLICITINT = @WFLAGS_NOIMPLICITINT@
+@@ -130,7 +133,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -198,10 +208,7 @@
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
+ @KRB5_TRUE@	$(LIB_krb4)					\
+ @KRB5_TRUE@	$(top_builddir)/lib/des/.libs/libdes.a		\
+-@KRB5_TRUE@	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
+-@KRB5_TRUE@	$(top_builddir)/lib/roken/.libs/libroken.a	\
+-@KRB5_TRUE@	$(LIB_getpwnam_r)				\
+-@KRB5_TRUE@	-lc
++@KRB5_TRUE@	@LIB_sl@
+ @KRB5_FALSE@L = @KRB5_FALSE@\
+ @KRB5_FALSE@	$(KAFS)						\
+ @KRB5_FALSE@	$(top_builddir)/lib/kadm/.libs/libkadm.a	\
+@@ -218,10 +225,7 @@
+ @KRB5_TRUE@	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
+ @KRB5_TRUE@	$(LIB_krb4)					\
+ @KRB5_TRUE@	$(top_builddir)/lib/des/.libs/libdes.so		\
+-@KRB5_TRUE@	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
+-@KRB5_TRUE@	$(top_builddir)/lib/roken/.libs/libroken.so	\
+-@KRB5_TRUE@	$(LIB_getpwnam_r)				\
+-@KRB5_TRUE@	-lc
++@KRB5_TRUE@	@LIB_sl@
+ @KRB5_FALSE@L_shared = @KRB5_FALSE@\
+ @KRB5_FALSE@	$(KAFS_S)					\
+ @KRB5_FALSE@	$(top_builddir)/lib/kadm/.libs/libkadm.so	\
+@@ -509,6 +513,12 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	fi
++@KRB5_TRUE@	$(top_builddir)/lib/roken/.libs/libroken.a	\
++@KRB5_TRUE@	$(LIB_getpwnam_r)				\
++@KRB5_TRUE@	-lc
++@KRB5_TRUE@	$(top_builddir)/lib/roken/.libs/libroken.so	\
++@KRB5_TRUE@	$(LIB_getpwnam_r)				\
++@KRB5_TRUE@	-lc
+ 
+ libsia_krb5.so: $(OBJS)
+ 	@if test -f $(top_builddir)/lib/krb5/.libs/libkrb5.a; then \
+diff -ruN heimdal-0.3d-old/lib/com_err/Makefile.in heimdal-0.3d/lib/com_err/Makefile.in
+--- heimdal-0.3d-old/lib/com_err/Makefile.in	Mon Dec 11 14:19:48 2000
++++ heimdal-0.3d/lib/com_err/Makefile.in	Tue Jan  9 10:36:43 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -433,6 +443,8 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+diff -ruN heimdal-0.3d-old/lib/des/Makefile.in heimdal-0.3d/lib/des/Makefile.in
+--- heimdal-0.3d-old/lib/des/Makefile.in	Mon Dec 11 14:19:49 2000
++++ heimdal-0.3d/lib/des/Makefile.in	Tue Jan  9 10:36:43 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -605,6 +615,8 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+diff -ruN heimdal-0.3d-old/lib/editline/Makefile.in heimdal-0.3d/lib/editline/Makefile.in
+--- heimdal-0.3d-old/lib/editline/Makefile.in	Mon Dec 11 14:19:49 2000
++++ heimdal-0.3d/lib/editline/Makefile.in	Tue Jan  9 10:36:43 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/gssapi/Makefile.in heimdal-0.3d/lib/gssapi/Makefile.in
+--- heimdal-0.3d-old/lib/gssapi/Makefile.in	Mon Dec 11 14:19:50 2000
++++ heimdal-0.3d/lib/gssapi/Makefile.in	Tue Jan  9 10:36:44 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/hdb/Makefile.in heimdal-0.3d/lib/hdb/Makefile.in
+--- heimdal-0.3d-old/lib/hdb/Makefile.in	Mon Dec 11 14:19:50 2000
++++ heimdal-0.3d/lib/hdb/Makefile.in	Tue Jan  9 10:36:44 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/kadm5/Makefile.in heimdal-0.3d/lib/kadm5/Makefile.in
+--- heimdal-0.3d-old/lib/kadm5/Makefile.in	Mon Dec 11 14:19:51 2000
++++ heimdal-0.3d/lib/kadm5/Makefile.in	Tue Jan  9 10:36:44 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/kafs/Makefile.in heimdal-0.3d/lib/kafs/Makefile.in
+--- heimdal-0.3d-old/lib/kafs/Makefile.in	Mon Dec 11 14:19:52 2000
++++ heimdal-0.3d/lib/kafs/Makefile.in	Tue Jan  9 10:36:45 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/kdfs/Makefile.in heimdal-0.3d/lib/kdfs/Makefile.in
+--- heimdal-0.3d-old/lib/kdfs/Makefile.in	Mon Dec 11 14:19:52 2000
++++ heimdal-0.3d/lib/kdfs/Makefile.in	Tue Jan  9 10:36:45 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/krb5/Makefile.in heimdal-0.3d/lib/krb5/Makefile.in
+--- heimdal-0.3d-old/lib/krb5/Makefile.in	Mon Dec 11 14:19:53 2000
++++ heimdal-0.3d/lib/krb5/Makefile.in	Tue Jan  9 10:36:46 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -125,13 +128,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_krb4)
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_com_err) $(INCLUDE_krb4)
+ 
+ AM_CFLAGS =  $(WFLAGS)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -204,7 +214,7 @@
+ 
+ 
+ libkrb5_la_LIBADD = \
+-	../com_err/error.lo ../com_err/com_err.lo \
++	$(LIB_com_err) \
+ 	$(KRB4LIB) \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+@@ -350,10 +360,10 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+-@KRB4_FALSE@libkrb5_la_DEPENDENCIES =  ../com_err/error.lo \
+-@KRB4_FALSE@../com_err/com_err.lo $(top_builddir)/lib/asn1/libasn1.la
+-@KRB4_TRUE@libkrb5_la_DEPENDENCIES =  ../com_err/error.lo \
+-@KRB4_TRUE@../com_err/com_err.lo $(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@libkrb5_la_DEPENDENCIES =  \
++@KRB4_FALSE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@libkrb5_la_DEPENDENCIES =  \
++@KRB4_TRUE@$(top_builddir)/lib/asn1/libasn1.la
+ @KRB4_FALSE@am_libkrb5_la_OBJECTS =  acl.lo add_et_list.lo \
+ @KRB4_FALSE@addr_families.lo address.lo aname_to_localname.lo \
+ @KRB4_FALSE@appdefault.lo asn1_glue.lo auth_context.lo build_ap_req.lo \
+@@ -848,6 +858,8 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+diff -ruN heimdal-0.3d-old/lib/otp/Makefile.in heimdal-0.3d/lib/otp/Makefile.in
+--- heimdal-0.3d-old/lib/otp/Makefile.in	Mon Dec 11 14:19:54 2000
++++ heimdal-0.3d/lib/otp/Makefile.in	Tue Jan  9 10:36:46 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -173,6 +176,13 @@
+ LIB_openldap = @LIB_openldap@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3d-old/lib/roken/Makefile.in heimdal-0.3d/lib/roken/Makefile.in
+--- heimdal-0.3d-old/lib/roken/Makefile.in	Mon Dec 11 14:23:10 2000
++++ heimdal-0.3d/lib/roken/Makefile.in	Tue Jan  9 10:36:46 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -357,7 +360,7 @@
+ 
+ depcomp = 
+ DIST_COMMON =  $(include_HEADERS) ChangeLog Makefile.am Makefile.in \
+-acinclude.m4 getcap.c getcwd.c getnameinfo.c glob.c install-sh \
++acinclude.m4 getcap.c getnameinfo.c glob.c install-sh \
+ make-print-version.c missing mkinstalldirs
+ 
+ 
+diff -ruN heimdal-0.3d-old/lib/sl/Makefile.in heimdal-0.3d/lib/sl/Makefile.in
+--- heimdal-0.3d-old/lib/sl/Makefile.in	Mon Dec 11 14:19:55 2000
++++ heimdal-0.3d/lib/sl/Makefile.in	Tue Jan  9 10:36:47 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -188,8 +198,6 @@
+ 
+ YFLAGS = -d
+ 
+-include_HEADERS = sl.h
+-
+ lib_LTLIBRARIES = libsl.la libss.la
+ libsl_la_LDFLAGS = -version-info 1:0:1
+ libss_la_LDFLAGS = -version-info 1:2:1
+@@ -215,7 +223,8 @@
+ EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
+ 
+ ssincludedir = $(includedir)/ss
+-ssinclude_HEADERS = ss.h
++buildssinclude = $(buildinclude)/ss
++ssinclude_HEADERS = sl.h ss.h
+ 
+ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
+ 
+@@ -259,11 +268,11 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(libsl_la_SOURCES) $(EXTRA_libsl_la_SOURCES) \
+ $(libss_la_SOURCES) $(mk_cmds_SOURCES) $(EXTRA_mk_cmds_SOURCES)
+-HEADERS =  $(include_HEADERS) $(ssinclude_HEADERS)
++HEADERS =  $(ssinclude_HEADERS)
+ 
+ depcomp = 
+-DIST_COMMON =  $(include_HEADERS) $(ssinclude_HEADERS) ChangeLog \
+-Makefile.am Makefile.in lex.c parse.c parse.h
++DIST_COMMON =  $(ssinclude_HEADERS) ChangeLog Makefile.am Makefile.in \
++lex.c parse.c parse.h
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -383,24 +392,6 @@
+ parse.h: parse.c
+ 
+ 
+-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; \
+-	  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 \
+-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+-	  rm -f $(DESTDIR)$(includedir)/$$f; \
+-	done
+-
+ install-ssincludeHEADERS: $(ssinclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(ssincludedir)
+@@ -476,20 +467,21 @@
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
++install-binPROGRAMS: install-libLTLIBRARIES
++
+ install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-exec: install-exec-am
+ 
+-install-data-am: install-includeHEADERS install-ssincludeHEADERS \
+-		install-data-local
++install-data-am: install-ssincludeHEADERS install-data-local
+ install-data: install-data-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
+-		uninstall-includeHEADERS uninstall-ssincludeHEADERS
++		uninstall-ssincludeHEADERS
+ uninstall: uninstall-am
+ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local
+ all-redirect: all-am
+@@ -497,7 +489,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
+ installdirs:
+ 	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
+-		$(DESTDIR)$(includedir) $(DESTDIR)$(ssincludedir)
++		$(DESTDIR)$(ssincludedir)
+ 
+ 
+ mostlyclean-generic:
+@@ -547,9 +539,8 @@
+ mostlyclean-libtool distclean-libtool clean-libtool \
+ maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
+ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
+-install-binPROGRAMS uninstall-includeHEADERS install-includeHEADERS \
+-uninstall-ssincludeHEADERS install-ssincludeHEADERS tags \
+-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
++install-binPROGRAMS uninstall-ssincludeHEADERS install-ssincludeHEADERS \
++tags mostlyclean-tags distclean-tags clean-tags maintainer-clean-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 \
+@@ -685,6 +676,19 @@
+ 	  echo "$$dashes"; \
+ 	  test "$$failed" -eq 0; \
+ 	fi
++
++install-build-headers:: $(ssinclude_HEADERS)
++	@foo='$(ssinclude_HEADERS)'; \
++	for f in $$foo; do \
++		f=`basename $$f`; \
++		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
++		else file="$$f"; fi; \
++		if cmp -s  $$file $(buildssinclude)/$$f 2> /dev/null ; then \
++		: ; else \
++			echo "cp $$file $(buildssinclude)/$$f";\
++			cp $$file $(buildssinclude)/$$f; \
++		fi ; \
++	done
+ 
+ $(mk_cmds_OBJECTS): parse.h
+ 
+diff -ruN heimdal-0.3d-old/lib/vers/Makefile.in heimdal-0.3d/lib/vers/Makefile.in
+--- heimdal-0.3d-old/lib/vers/Makefile.in	Mon Dec 11 14:19:55 2000
++++ heimdal-0.3d/lib/vers/Makefile.in	Tue Jan  9 10:36:47 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -189,7 +199,6 @@
+ CLEANFILES = print_version.h
+ 
+ noinst_LTLIBRARIES = libvers.la
+-libvers_la_LDFLAGS = -static
+ 
+ build_HEADERZ = vers.h
+ 
+@@ -212,6 +221,7 @@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
++libvers_la_LDFLAGS = 
+ libvers_la_LIBADD = 
+ am_libvers_la_OBJECTS =  print_version.lo
+ libvers_la_OBJECTS =  $(am_libvers_la_OBJECTS)
+diff -ruN heimdal-0.3d-old/tools/Makefile.in heimdal-0.3d/tools/Makefile.in
+--- heimdal-0.3d-old/tools/Makefile.in	Mon Dec 11 14:20:09 2000
++++ heimdal-0.3d/tools/Makefile.in	Tue Jan  9 10:36:55 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,11 +69,13 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
+@@ -91,6 +94,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -101,7 +105,6 @@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+-STRIP = @STRIP@
+ VERSION = @VERSION@
+ VOID_RETSIGTYPE = @VOID_RETSIGTYPE@
+ WFLAGS = @WFLAGS@
+@@ -131,7 +134,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,6 +177,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+@@ -513,6 +523,7 @@
+ 		-e "s,@includedir\@,$(includedir),g" \
+ 		-e "s,@LIB_crypt\@,$(LIB_crypt),g" \
+ 		-e "s,@LIB_dbopen\@,$(LIB_dbopen),g" \
++		-e "s,@LIB_des\@,$(LIB_des),g" \
+ 		-e "s,@LIBS\@,$(LIBS),g" \
+ 		$(srcdir)/krb5-config.in > $@
+ 	chmod +x $@
--- heimdal-0.6.3.orig/debian/patches-0.3e/001_replay_log
+++ heimdal-0.6.3/debian/patches-0.3e/001_replay_log
@@ -0,0 +1,94 @@
+From nobody Wed Feb 21 09:03:25 2001
+X-From-Line: maildir Tue Feb 20 05:53:57 2001
+Return-Path: <heimdal-discuss-owner@sics.se>
+Delivered-To: bam@snoopy.apana.org.au
+Received: from color.sics.se (color.sics.se [193.10.66.199])
+	by snoopy.apana.org.au (Postfix) with ESMTP id AEF2734409
+	for <bam@snoopy.apana.org.au>; Tue, 20 Feb 2001 05:53:16 +1100 (EST)
+Received: (from majordom@localhost)
+	by color.sics.se (8.9.3/8.9.3) id TAA17651
+        for heimdal-discuss-outgoing; Mon, 19 Feb 2001 19:13:02 +0100 (MET)
+	env-from (owner-heimdal-discuss@sics.se)
+Received: from blubb.pdc.kth.se (blubb.pdc.kth.se [130.237.221.147])
+	by color.sics.se (8.9.3/8.9.3) with ESMTP id TAA17639
+        for <heimdal-discuss@sics.se>; Mon, 19 Feb 2001 19:13:00 +0100 (MET)
+	env-from (joda@pdc.kth.se)
+Received: from joda by blubb.pdc.kth.se with local (Exim 3.13 #1)
+	id 14Uunz-0003Yx-00; Mon, 19 Feb 2001 19:12:59 +0100
+To: GOMBAS Gabor <gombasg@inf.elte.hu>
+Cc: heimdal-discuss@sics.se
+Subject: Re: Recovering from corrupted database
+References: <20010219173202.K50240@pandora.inf.elte.hu>
+	<xof8zn2a7cz.fsf@blubb.pdc.kth.se>
+From: joda@pdc.kth.se (Johan Danielsson)
+Date: 19 Feb 2001 19:12:59 +0100
+In-Reply-To: joda@pdc.kth.se's message of "19 Feb 2001 18:51:56 +0100"
+X-Gnus-Mail-Source: maildir:~/Maildir/new
+Message-ID: <xofvgq68rtg.fsf@blubb.pdc.kth.se>
+User-Agent: Gnus/5.0807 (Gnus v5.8.7) Emacs/20.7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-1
+Content-Transfer-Encoding: 8bit
+X-MIME-Autoconverted: from quoted-printable to 8bit by color.sics.se id TAA17640
+Sender: owner-heimdal-discuss@sics.se
+Precedence: bulk
+Lines: 57
+Xref: snoopy.apana.org.au heimdal.discuss:320
+
+joda@pdc.kth.se (Johan Danielsson) writes:
+
+> [...] but you'd still have to hack replay_log to ignore versions
+> older than that (we should fix this).
+
+Something like this.
+
+/Johan
+
+--- heimdal-0.3e/lib/kadm5/replay_log.c	1999/12/04 19:51:11	1.7
++++ heimdal-0.3e/lib/kadm5/replay_log.c	2001/02/19 18:10:43	1.8
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
++ * Copyright (c) 1997, 1998, 1999, 2001 Kungliga Tekniska Högskolan
+  * (Royal Institute of Technology, Stockholm, Sweden). 
+  * All rights reserved. 
+  *
+@@ -33,8 +33,11 @@
+ 
+ #include "iprop.h"
+ 
+-RCSID("$Id: replay_log.c,v 1.7 1999/12/04 19:51:11 assar Exp $");
++RCSID("$Id: replay_log.c,v 1.8 2001/02/19 18:10:43 joda Exp $");
+ 
++int start_version = -1;
++int end_version = -1;
++
+ static void
+ apply_entry(kadm5_server_context *server_context,
+ 	    u_int32_t ver,
+@@ -45,6 +48,12 @@
+ {
+     krb5_error_code ret;
+ 
++    if((start_version != -1 && ver < start_version) ||
++       (end_version != -1 && ver > end_version)) {
++	/* XXX skip this entry */
++	(*sp->seek)(sp, len, SEEK_CUR);
++	return;
++    }
+     printf ("ver %u... ", ver);
+     fflush (stdout);
+ 
+@@ -60,6 +69,8 @@
+ int version_flag;
+ int help_flag;
+ struct getargs args[] = {
++    { "start-version", 0, arg_integer, &start_version, "start replay with this version" },
++    { "end-version", 0, arg_integer, &end_version, "end replay with this version" },
+     { "version", 0, arg_flag, &version_flag },
+     { "help", 0, arg_flag, &help_flag }
+ };
+
+
+
+
--- heimdal-0.6.3.orig/debian/patches-0.3e/000_weakkey
+++ heimdal-0.6.3/debian/patches-0.3e/000_weakkey
@@ -0,0 +1,97 @@
+From nobody Sat Feb 17 13:52:39 2001
+X-From-Line: maildir Sat Feb 17 03:12:10 2001
+Return-Path: <heimdal-discuss-owner@sics.se>
+Delivered-To: bam@snoopy.apana.org.au
+Received: from color.sics.se (color.sics.se [193.10.66.199])
+	by snoopy.apana.org.au (Postfix) with ESMTP id 6219432E7F
+	for <bam@snoopy.apana.org.au>; Sat, 17 Feb 2001 03:11:43 +1100 (EST)
+Received: (from majordom@localhost)
+	by color.sics.se (8.9.3/8.9.3) id QAA06249
+        for heimdal-discuss-outgoing; Fri, 16 Feb 2001 16:30:33 +0100 (MET)
+	env-from (owner-heimdal-discuss@sics.se)
+Received: from assaris.sics.se (assaris.sics.se [193.10.66.234])
+	by color.sics.se (8.9.3/8.9.3) with ESMTP id QAA06243
+        for <heimdal-discuss@sics.se>; Fri, 16 Feb 2001 16:30:31 +0100 (MET)
+	env-from (assar@assaris.sics.se)
+Received: (from assar@localhost)
+	by assaris.sics.se (8.9.3/8.9.3) id QAA55487;
+	Fri, 16 Feb 2001 16:30:43 +0100 (CET)
+	(envelope-from assar)
+To: "Brandon S. Allbery KF8NH" <allbery@ece.cmu.edu>
+Cc: heimdal-discuss@sics.se
+Subject: Re: Weak key detection (was Re: OpenSSL patch for Heimdal 0.3d)
+References: <48060000.982281449@pyanfar.ece.cmu.edu>
+From: Assar Westerlund <assar@sics.se>
+Date: 16 Feb 2001 16:30:42 +0100
+In-Reply-To: "Brandon S. Allbery KF8NH"'s message of "Thu, 15 Feb 2001 18:57:30 -0500"
+X-Gnus-Mail-Source: maildir:~/Maildir/new
+Message-ID: <5litmay7a5.fsf@assaris.sics.se>
+User-Agent: Gnus/5.070098 (Pterodactyl Gnus v0.98) Emacs/20.6
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="=-=-="
+Sender: owner-heimdal-discuss@sics.se
+Precedence: bulk
+Lines: 61
+Xref: snoopy.apana.org.au heimdal.discuss:313
+
+
+--=-=-=
+
+"Brandon S. Allbery KF8NH" <allbery@ece.cmu.edu> writes:
+> Tangent:  Jeff Hutzelman just reminded me that he has found a problem with 
+> the weak key detection in kth-krb and heimdal.
+
+He sent me mail actually, and I've fixed it.  Patch follows.  And
+there's no reason to panic really, the probability of hiting these
+keys is very small, but of course the test should be done correctly.
+
+/assar
+
+
+--=-=-=
+Content-Disposition: attachment
+
+rsh: juguete.sics.se: Password has expired
+Index: set_key.c
+===================================================================
+RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/lib/des/set_key.c,v
+retrieving revision 1.4
+retrieving revision 1.6
+diff -u -w -u -w -r1.4 -r1.6
+--- heimdal-0.3e/lib/des/set_key.c	1997/06/22 10:14:05	1.4
++++ heimdal-0.3e/lib/des/set_key.c	2001/02/16 15:26:37	1.6
+@@ -97,7 +97,7 @@
+ 	return(1);
+ 	}
+ 
+-/* Weak and semi week keys as take from
++/* Weak and semi week keys were originally as take from
+  * %A D.W. Davies
+  * %A W.L. Price
+  * %T Security for Computer Networks
+@@ -106,13 +106,18 @@
+  * Many thanks to smb@ulysses.att.com (Steven Bellovin) for the reference
+  * (and actual cblock values).
+  */
++
++/* The corrected values are from FIPS 74:
++ * http://www.itl.nist.gov/fipspubs/fip74.htm
++ */
++
+ #define NUM_WEAK_KEY	16
+ static des_cblock weak_keys[NUM_WEAK_KEY]={
+ 	/* weak keys */
+ 	{0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
+ 	{0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
+-	{0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F},
+-	{0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0},
++	{0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
++	{0xE0,0xE0,0xE0,0xE0,0xF1,0xF1,0xF1,0xF1},
+ 	/* semi-weak keys */
+ 	{0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
+ 	{0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
+
+--=-=-=--
+
+
+
--- heimdal-0.6.3.orig/debian/patches-0.3e/011_sharedlibs
+++ heimdal-0.6.3/debian/patches-0.3e/011_sharedlibs
@@ -0,0 +1,376 @@
+diff -ruN heimdal-0.3e-old/cf/Makefile.am.common heimdal-0.3e/cf/Makefile.am.common
+--- heimdal-0.3e-old/cf/Makefile.am.common	Tue Dec  5 20:11:09 2000
++++ heimdal-0.3e/cf/Makefile.am.common	Sat May 12 17:00:04 2001
+@@ -171,8 +171,7 @@
+ endif
+ 
+ if KRB5
+-LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
+-	$(top_builddir)/lib/asn1/libasn1.la
++LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la
+ LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
+ endif
+ 
+diff -ruN heimdal-0.3e-old/cf/roken-frag.m4 heimdal-0.3e/cf/roken-frag.m4
+--- heimdal-0.3e-old/cf/roken-frag.m4	Sat Dec 16 01:29:54 2000
++++ heimdal-0.3e/cf/roken-frag.m4	Sat May 12 17:22:41 2001
+@@ -578,9 +578,9 @@
+ dnl moved to AC_OUTPUT in configure.in
+ dnl AC_CONFIG_FILES($1/Makefile)
+ 
+-LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++dnl LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+ AC_SUBST(DIR_roken)dnl
+ AC_SUBST(LIB_roken)dnl
+ AC_SUBST(INCLUDES_roken)dnl
+-])
+\ No newline at end of file
++])
+diff -ruN heimdal-0.3e-old/cf/roken.m4 heimdal-0.3e/cf/roken.m4
+--- heimdal-0.3e-old/cf/roken.m4	Sun Jul  9 01:50:34 2000
++++ heimdal-0.3e/cf/roken.m4	Sat May 12 16:30:55 2001
+@@ -56,7 +56,7 @@
+   CPPFLAGS_roken="-I$i/include"
+ fi
+ 
+-LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++dnl LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+ AC_SUBST(LIB_roken)dnl
+ AC_SUBST(DIR_roken)dnl
+diff -ruN heimdal-0.3e-old/configure.in heimdal-0.3e/configure.in
+--- heimdal-0.3e-old/configure.in	Mon Feb  5 18:58:05 2001
++++ heimdal-0.3e/configure.in	Thu May 17 17:01:34 2001
+@@ -83,7 +83,10 @@
+ 	LIB_openldap="-R $openldap_libdir $LIB_openldap"
+ fi
+ 
+-AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4)
++AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,,KRB4)
++if test "$krb4_libdir" = "/usr/lib"; then
++  krb4_libdir="";
++fi
+ 
+ LIB_kdb=
+ if test "$with_krb4" != "no"; then
+@@ -153,9 +156,9 @@
+ 	LIBS="$save_LIBS"
+ 	CFLAGS="$save_CFLAGS"
+ 	LIB_kdb="-lkdb -lkrb"
+-	if test "$krb4_libdir"; then
+-		LIB_krb4="-R $krb4_libdir $LIB_krb4"
+-		LIB_kdb="-R $krb4_libdir -L$krb4_libdir $LIB_kdb"
++	if test "$krb4_libdir" != ""; then
++		LIB_krb4="-rpath $krb4_libdir $LIB_krb4"
++		LIB_kdb="-rpath $krb4_libdir -L$krb4_libdir $LIB_kdb"
+ 	fi
+ fi
+ AM_CONDITIONAL(KRB4, test "$with_krb4" != "no")
+diff -ruN heimdal-0.3e-old/lib/asn1/Makefile.am heimdal-0.3e/lib/asn1/Makefile.am
+--- heimdal-0.3e-old/lib/asn1/Makefile.am	Tue Jan 30 12:46:53 2001
++++ heimdal-0.3e/lib/asn1/Makefile.am	Sat May 12 18:50:28 2001
+@@ -5,7 +5,9 @@
+ YFLAGS = -d
+ 
+ lib_LTLIBRARIES = libasn1.la
+-libasn1_la_LDFLAGS = -version-info 4:0:2
++libasn1_la_LDFLAGS = -version-info 4:0:2 -no-undefined
++libasn1_la_LIBADD = \
++	$(top_builddir)/lib/com_err/libcom_err.la
+ 
+ BUILT_SOURCES =			\
+ 	$(gen_files:.x=.c)	\
+diff -ruN heimdal-0.3e-old/lib/auth/sia/Makefile.am heimdal-0.3e/lib/auth/sia/Makefile.am
+--- heimdal-0.3e-old/lib/auth/sia/Makefile.am	Tue Jan 30 09:38:36 2001
++++ heimdal-0.3e/lib/auth/sia/Makefile.am	Sat May 12 18:51:33 2001
+@@ -74,7 +74,7 @@
+ foodir = $(libdir)
+ foo_DATA = $(MOD)
+ 
+-LDFLAGS = -rpath $(libdir) -hidden -exported_symbol siad_\* 
++LDFLAGS = -rpath $(libdir) -hidden -exported_symbol siad_\*  -no-undefined
+ 
+ OBJS = sia.o posix_getpw.o
+ 
+diff -ruN heimdal-0.3e-old/lib/com_err/Makefile.am heimdal-0.3e/lib/com_err/Makefile.am
+--- heimdal-0.3e-old/lib/com_err/Makefile.am	Wed Aug 16 21:24:54 2000
++++ heimdal-0.3e/lib/com_err/Makefile.am	Sat May 12 18:51:37 2001
+@@ -5,7 +5,7 @@
+ YFLAGS = -d
+ 
+ lib_LTLIBRARIES = libcom_err.la
+-libcom_err_la_LDFLAGS = -version-info 1:1:0
++libcom_err_la_LDFLAGS = -version-info 1:1:0 -no-undefined
+ 
+ bin_PROGRAMS = compile_et
+ 
+diff -ruN heimdal-0.3e-old/lib/des/Makefile.am heimdal-0.3e/lib/des/Makefile.am
+--- heimdal-0.3e-old/lib/des/Makefile.am	Tue Jan 30 12:47:41 2001
++++ heimdal-0.3e/lib/des/Makefile.am	Sat May 12 18:51:43 2001
+@@ -3,7 +3,7 @@
+ include $(top_srcdir)/Makefile.am.common
+ 
+ lib_LTLIBRARIES = libdes.la
+-libdes_la_LDFLAGS = -version-info 3:0:0
++libdes_la_LDFLAGS = -version-info 3:0:0 -no-undefined
+ 
+ include_HEADERS = des.h md4.h md5.h sha.h rc4.h
+ 
+diff -ruN heimdal-0.3e-old/lib/editline/Makefile.am heimdal-0.3e/lib/editline/Makefile.am
+--- heimdal-0.3e-old/lib/editline/Makefile.am	Wed Nov 15 10:22:29 2000
++++ heimdal-0.3e/lib/editline/Makefile.am	Sun May 13 08:37:43 2001
+@@ -38,13 +38,13 @@
+ 	unix.h \
+ 	$(EXTRA_SOURCE)
+ 
+-libeditline_la_LDFLAGS = -static
++libeditline_la_LDFLAGS = -no-undefined
+ 
+ EXTRA_SOURCE = $(ES) 
+ 
+ libel_compat_la_SOURCES = edit_compat.c
+ 
+-libel_compat_la_LDFLAGS = -static
++libel_compat_la_LDFLAGS = -no-undefined
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
+diff -ruN heimdal-0.3e-old/lib/gssapi/Makefile.am heimdal-0.3e/lib/gssapi/Makefile.am
+--- heimdal-0.3e-old/lib/gssapi/Makefile.am	Tue Jan 30 12:51:53 2001
++++ heimdal-0.3e/lib/gssapi/Makefile.am	Sat May 12 18:52:05 2001
+@@ -5,7 +5,11 @@
+ INCLUDES += -I$(srcdir)/../krb5 $(INCLUDE_krb4)
+ 
+ lib_LTLIBRARIES = libgssapi.la
+-libgssapi_la_LDFLAGS = -version-info 3:0:2
++libgssapi_la_LDFLAGS = -version-info 3:0:2 -no-undefined
++libgssapi_la_LIBADD = \
++	$(LIB_krb5) \
++	$(LIB_des) \
++	$(top_builddir)/lib/asn1/libasn1.la 
+ 
+ include_HEADERS = gssapi.h
+ 
+diff -ruN heimdal-0.3e-old/lib/hdb/Makefile.am heimdal-0.3e/lib/hdb/Makefile.am
+--- heimdal-0.3e-old/lib/hdb/Makefile.am	Tue Jan 30 12:49:16 2001
++++ heimdal-0.3e/lib/hdb/Makefile.am	Sat May 12 18:52:10 2001
+@@ -12,17 +12,18 @@
+ CLEANFILES = $(BUILT_SOURCES) $(foo) hdb_asn1.h asn1_files
+ 
+ noinst_PROGRAMS = convert_db
+-LDADD = libhdb.la \
++LDADD = libhdb.la
++
++lib_LTLIBRARIES = libhdb.la
++libhdb_la_LDFLAGS = -version-info 7:0:0 -no-undefined
++libhdb_la_LIBADD = \
+ 	$(LIB_openldap) \
+ 	../krb5/libkrb5.la \
+ 	../asn1/libasn1.la \
+-	$(LIB_des) \
+ 	$(LIB_roken) \
++	$(top_builddir)/lib/com_err/libcom_err.la \
+ 	$(DBLIB)
+ 
+-lib_LTLIBRARIES = libhdb.la
+-libhdb_la_LDFLAGS = -version-info 7:0:0
+-
+ libhdb_la_SOURCES =				\
+ 	common.c				\
+ 	db.c					\
+@@ -38,8 +39,6 @@
+ INCLUDES += $(INCLUDE_openldap)
+ 
+ include_HEADERS = hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h
+-
+-libhdb_la_LIBADD = $(LIB_openldap)
+ 
+ $(libhdb_la_OBJECTS): $(srcdir)/hdb-protos.h $(srcdir)/hdb-private.h
+ 
+diff -ruN heimdal-0.3e-old/lib/kadm5/Makefile.am heimdal-0.3e/lib/kadm5/Makefile.am
+--- heimdal-0.3e-old/lib/kadm5/Makefile.am	Tue Jan 30 12:56:00 2001
++++ heimdal-0.3e/lib/kadm5/Makefile.am	Sat May 12 18:52:14 2001
+@@ -3,8 +3,21 @@
+ include $(top_srcdir)/Makefile.am.common
+ 
+ lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la
+-libkadm5srv_la_LDFLAGS = -version-info 7:3:0
++libkadm5srv_la_LDFLAGS = -version-info 7:3:0 -no-undefined
++libkadm5srv_la_LIBADD = \
++	$(LIB_roken) \
++	$(LIB_krb5) \
++	$(top_builddir)/lib/com_err/libcom_err.la \
++	$(top_builddir)/lib/asn1/libasn1.la \
++	$(top_builddir)/lib/hdb/libhdb.la \
++	$(LIB_dlopen)
++
+ libkadm5clnt_la_LDFLAGS = -version-info 6:1:2
++libkadm5clnt_la_LIBADD = \
++	$(LIB_roken) \
++	$(LIB_krb5) \
++	$(top_builddir)/lib/com_err/libcom_err.la
++
+ sbin_PROGRAMS = dump_log replay_log truncate_log
+ 
+ libexec_PROGRAMS = ipropd-master ipropd-slave
+diff -ruN heimdal-0.3e-old/lib/kafs/Makefile.am heimdal-0.3e/lib/kafs/Makefile.am
+--- heimdal-0.3e-old/lib/kafs/Makefile.am	Mon Dec 11 11:44:50 2000
++++ heimdal-0.3e/lib/kafs/Makefile.am	Sat May 12 18:52:17 2001
+@@ -41,7 +41,7 @@
+ 
+ 
+ lib_LTLIBRARIES = $(AFSLIBS)
+-libkafs_la_LDFLAGS = -version-info 2:3:2
++libkafs_la_LDFLAGS = -version-info 2:3:2 -no-undefined
+ foodir = $(libdir)
+ foo_DATA = $(AFS_EXTRA_LIBS)
+ # EXTRA_DATA = afslib.so
+diff -ruN heimdal-0.3e-old/lib/kdfs/Makefile.am heimdal-0.3e/lib/kdfs/Makefile.am
+--- heimdal-0.3e-old/lib/kdfs/Makefile.am	Mon Dec 11 11:46:47 2000
++++ heimdal-0.3e/lib/kdfs/Makefile.am	Sat May 12 18:52:23 2001
+@@ -7,4 +7,4 @@
+ libkdfs_la_SOURCES = \
+ 	k5dfspag.c
+ 
+-libkdfs_la_LDFLAGS = -version-info 0:1:0
++libkdfs_la_LDFLAGS = -version-info 0:1:0 -no-undefined
+diff -ruN heimdal-0.3e-old/lib/krb5/Makefile.am heimdal-0.3e/lib/krb5/Makefile.am
+--- heimdal-0.3e-old/lib/krb5/Makefile.am	Tue Jan 30 12:50:52 2001
++++ heimdal-0.3e/lib/krb5/Makefile.am	Sat May 12 18:52:27 2001
+@@ -9,16 +9,15 @@
+ check_PROGRAMS = n-fold-test string-to-key-test
+ TESTS = n-fold-test string-to-key-test
+ 
+-LDADD = libkrb5.la \
+-	$(LIB_des) \
+-	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(LIB_roken)
++LDADD = libkrb5.la
+ 
+ libkrb5_la_LIBADD = \
+-	../com_err/error.lo ../com_err/com_err.lo \
++	$(LIB_res_search) \
++	$(top_builddir)/lib/com_err/libcom_err.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(LIB_roken)
++	$(LIB_roken) \
++	$(LIB_dbopen)
+ 
+ lib_LTLIBRARIES = libkrb5.la
+ 
+@@ -119,7 +118,7 @@
+ 	write_message.c \
+ 	$(ERR_FILES)
+ 
+-libkrb5_la_LDFLAGS = -version-info 15:0:0
++libkrb5_la_LDFLAGS = -version-info 15:0:0 -no-undefined
+ 
+ $(libkrb5_la_OBJECTS): $(srcdir)/krb5-protos.h $(srcdir)/krb5-private.h
+ 
+diff -ruN heimdal-0.3e-old/lib/otp/Makefile.am heimdal-0.3e/lib/otp/Makefile.am
+--- heimdal-0.3e-old/lib/otp/Makefile.am	Tue Jan 30 12:54:48 2001
++++ heimdal-0.3e/lib/otp/Makefile.am	Sat May 12 18:52:31 2001
+@@ -6,15 +6,16 @@
+ 
+ noinst_PROGRAMS = otptest
+ 
+-otptest_LDADD = libotp.la \
+-	$(LIB_des) \
+-	$(LIB_roken) \
+-	$(DBLIB)
++otptest_LDADD = libotp.la
+ 
+ include_HEADERS = otp.h
+ 
+ lib_LTLIBRARIES = libotp.la
+-libotp_la_LDFLAGS = -version-info 1:2:1
++libotp_la_LDFLAGS = -version-info 1:2:1 -no-undefined
++libotp_la_LIBADD = \
++	$(LIB_roken) \
++	$(LIB_des) \
++	$(DBLIB)
+ 
+ libotp_la_SOURCES = \
+ 	otp.c \
+diff -ruN heimdal-0.3e-old/lib/roken/Makefile.am heimdal-0.3e/lib/roken/Makefile.am
+--- heimdal-0.3e-old/lib/roken/Makefile.am	Tue Jan 30 12:53:30 2001
++++ heimdal-0.3e/lib/roken/Makefile.am	Sat May 12 18:52:34 2001
+@@ -10,7 +10,12 @@
+ CLEANFILES = roken.h make-roken.c $(XHEADERS)
+ 
+ lib_LTLIBRARIES = libroken.la
+-libroken_la_LDFLAGS = -version-info 11:1:2
++libroken_la_LDFLAGS = -version-info 11:1:2 -no-undefined
++libroken_la_LIBADD = \
++	@LIB_res_search@ \
++	$(LIB_des) \
++	@LIB_dbopen@ \
++	@LTLIBOBJS@
+ 
+ noinst_PROGRAMS = make-roken
+ 
+@@ -149,8 +154,6 @@
+ 	writev.c
+ 
+ EXTRA_DIST = roken.awk roken.h.in
+-
+-libroken_la_LIBADD = @LTLIBOBJS@
+ 
+ $(LTLIBOBJS) $(libroken_la_OBJECTS): $(include_HEADERS) roken.h
+ 
+diff -ruN heimdal-0.3e-old/lib/sl/Makefile.am heimdal-0.3e/lib/sl/Makefile.am
+--- heimdal-0.3e-old/lib/sl/Makefile.am	Sat Jan 27 02:00:09 2001
++++ heimdal-0.3e/lib/sl/Makefile.am	Sat May 12 19:01:23 2001
+@@ -7,11 +7,11 @@
+ include_HEADERS = sl.h
+ 
+ lib_LTLIBRARIES = libsl.la libss.la
+-libsl_la_LDFLAGS = -version-info 1:1:1
+-libss_la_LDFLAGS = -version-info 1:3:1
++libsl_la_LDFLAGS = -version-info 1:1:1 -no-undefined
++libss_la_LDFLAGS = -version-info 1:3:1 -no-undefined
+ 
+-libsl_la_LIBADD = @LIB_readline@
+-libss_la_LIBADD = @LIB_readline@
++libsl_la_LIBADD = $(LIB_roken) @LIB_readline@
++libss_la_LIBADD = $(LIB_roken) @LIB_readline@
+ 
+ RENAME_SRC = roken_rename.h strtok_r.c snprintf.c
+ 
+diff -ruN heimdal-0.3e-old/lib/vers/Makefile.am heimdal-0.3e/lib/vers/Makefile.am
+--- heimdal-0.3e-old/lib/vers/Makefile.am	Wed Jan 31 14:50:48 2001
++++ heimdal-0.3e/lib/vers/Makefile.am	Sat May 12 18:53:25 2001
+@@ -19,6 +19,7 @@
+ endif
+ 
+ libvers_la_SOURCES	= print_version.c
++libvers_la_LDFLAGS	= -no-undefined
+ 
+ print_version.lo: print_version.h
+ 
+diff -ruN heimdal-0.3e-old/tools/krb5-config.in heimdal-0.3e/tools/krb5-config.in
+--- heimdal-0.3e-old/tools/krb5-config.in	Mon Jan 29 17:56:51 2001
++++ heimdal-0.3e/tools/krb5-config.in	Sat May 12 17:01:01 2001
+@@ -89,6 +89,9 @@
+ if test "$do_libs" = "yes"; then
+     lib_flags="-L${libdir}"
+     case $library in
++    krb5)
++	lib_flags="$lib_flags -lkrb5"
++	;;
+     gssapi)
+ 	lib_flags="$lib_flags -lgssapi"
+ 	;;
+@@ -99,8 +102,8 @@
+ 	lib_flags="$lib_flags -lkadm5srv"
+ 	;;
+     esac
+-    lib_flags="$lib_flags -lkrb5 -lasn1 @LIB_des_appl@ -lroken"
+-    lib_flags="$lib_flags @LIB_crypt@ @LIB_dbopen@ @LIBS@"
++#    lib_flags="$lib_flags -lkrb5 -lasn1 @LIB_des_appl@ -lroken"
++#    lib_flags="$lib_flags @LIB_crypt@ @LIB_dbopen@ @LIBS@"
+     echo $lib_flags
+ fi
+ if test "$do_cflags" = "yes"; then
--- heimdal-0.6.3.orig/debian/patches-0.3e/010_openssl
+++ heimdal-0.6.3/debian/patches-0.3e/010_openssl
@@ -0,0 +1,394 @@
+diff -ruN heimdal-0.3e-old/admin/ktutil_locl.h heimdal-0.3e/admin/ktutil_locl.h
+--- heimdal-0.3e-old/admin/ktutil_locl.h	Wed Jul 19 23:58:19 2000
++++ heimdal-0.3e/admin/ktutil_locl.h	Wed Feb  7 12:18:43 2001
+@@ -54,7 +54,11 @@
+ #include <parse_time.h>
+ #include <roken.h>
+ 
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ 
+ #include <krb5.h>
+ #include <kadm5/admin.h>
+diff -ruN heimdal-0.3e-old/appl/ftp/ftp/ftp_locl.h heimdal-0.3e/appl/ftp/ftp/ftp_locl.h
+--- heimdal-0.3e-old/appl/ftp/ftp/ftp_locl.h	Fri Dec  3 03:58:29 1999
++++ heimdal-0.3e/appl/ftp/ftp/ftp_locl.h	Wed Feb  7 12:19:39 2001
+@@ -129,7 +129,11 @@
+ 
+ #include "roken.h"
+ #include "security.h"
+-#include <des.h> /* for des_read_pw_string */
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
++#include <des.h>
++#endif
+ 
+ #if defined(__sun__) && !defined(__svr4)
+ int fclose(FILE*);
+diff -ruN heimdal-0.3e-old/appl/kx/common.c heimdal-0.3e/appl/kx/common.c
+--- heimdal-0.3e-old/appl/kx/common.c	Wed Jan 17 21:09:16 2001
++++ heimdal-0.3e/appl/kx/common.c	Wed Feb  7 12:20:16 2001
+@@ -405,7 +405,7 @@
+      auth.name_length = strlen(auth.name);
+      auth.data_length = cookie_sz;
+      auth.data = (char*)cookie;
+-     des_rand_data (cookie, cookie_sz);
++     krb5_generate_random_block (cookie, cookie_sz);
+ 
+      strlcpy(xauthfile, "/tmp/AXXXXXX", xauthfile_size);
+      fd = mkstemp(xauthfile);
+diff -ruN heimdal-0.3e-old/appl/otp/otp_locl.h heimdal-0.3e/appl/otp/otp_locl.h
+--- heimdal-0.3e-old/appl/otp/otp_locl.h	Fri Dec  3 03:58:32 1999
++++ heimdal-0.3e/appl/otp/otp_locl.h	Wed Feb  7 12:20:53 2001
+@@ -52,5 +52,9 @@
+ #endif
+ #include <roken.h>
+ #include <err.h>
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <otp.h>
+diff -ruN heimdal-0.3e-old/appl/su/su.c heimdal-0.3e/appl/su/su.c
+--- heimdal-0.3e-old/appl/su/su.c	Sat Jan 27 03:02:49 2001
++++ heimdal-0.3e/appl/su/su.c	Wed Feb  7 12:21:30 2001
+@@ -50,7 +50,11 @@
+ 
+ #include <pwd.h>
+ 
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <kafs.h>
+ #include <err.h>
+diff -ruN heimdal-0.3e-old/appl/telnet/libtelnet/enc_des.c heimdal-0.3e/appl/telnet/libtelnet/enc_des.c
+--- heimdal-0.3e-old/appl/telnet/libtelnet/enc_des.c	Fri Jul 10 09:16:23 1998
++++ heimdal-0.3e/appl/telnet/libtelnet/enc_des.c	Wed Feb  7 12:23:14 2001
+@@ -50,8 +50,6 @@
+ #include "encrypt.h"
+ #include "misc-proto.h"
+ 
+-#include <des.h>
+-
+ extern int encrypt_debug_mode;
+ 
+ #define	CFB	0
+@@ -208,19 +206,7 @@
+ 		/*
+ 		 * Create a random feed and send it over.
+ 		 */
+-#ifndef OLD_DES_RANDOM_KEY
+ 		des_new_random_key(&fbp->temp_feed);
+-#else
+-		/*
+-		 * From des_cryp.man "If the des_check_key flag is non-zero,
+-		 *  des_set_key will check that the key passed is
+-		 *  of odd parity and is not a week or semi-weak key."
+-		 */
+-		do {
+-			des_random_key(fbp->temp_feed);
+-			des_set_odd_parity(fbp->temp_feed);
+-		} while (des_is_weak_key(fbp->temp_feed));
+-#endif
+ 		des_ecb_encrypt(&fbp->temp_feed,
+ 				&fbp->temp_feed,
+ 				fbp->krbdes_sched, 1);
+@@ -404,7 +390,7 @@
+ 	fb64_stream_key(fbp->krbdes_key, &fbp->streams[DIR_DECRYPT-1]);
+ 
+ 	if (fbp->once == 0) {
+-#ifndef OLD_DES_RANDOM_KEY
++#ifndef HAVE_OPENSSL_DES_H
+ 		des_init_random_number_generator(&fbp->krbdes_key);
+ #endif
+ 		fbp->once = 1;
+diff -ruN heimdal-0.3e-old/appl/telnet/libtelnet/encrypt.h heimdal-0.3e/appl/telnet/libtelnet/encrypt.h
+--- heimdal-0.3e-old/appl/telnet/libtelnet/encrypt.h	Sat Jan 25 10:10:56 1997
++++ heimdal-0.3e/appl/telnet/libtelnet/encrypt.h	Wed Feb  7 12:24:00 2001
+@@ -90,6 +90,13 @@
+ 
+ #define	SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
+ 
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#define des_new_random_key des_random_key
++#else
++#include <des.h>
++#endif
++
+ #include "enc-proto.h"
+ 
+ extern int encrypt_debug_mode;
+diff -ruN heimdal-0.3e-old/appl/telnet/libtelnet/kerberos.c heimdal-0.3e/appl/telnet/libtelnet/kerberos.c
+--- heimdal-0.3e-old/appl/telnet/libtelnet/kerberos.c	Thu Nov 23 13:28:06 2000
++++ heimdal-0.3e/appl/telnet/libtelnet/kerberos.c	Wed Feb  7 12:24:27 2001
+@@ -65,7 +65,6 @@
+ #include <arpa/telnet.h>
+ #endif
+ #include <stdio.h>
+-#include <des.h>	/* BSD wont include this in krb.h, so we do it here */
+ #include <krb.h>
+ #include <pwd.h>
+ #include <stdlib.h>
+diff -ruN heimdal-0.3e-old/appl/telnet/libtelnet/krb4encpwd.c heimdal-0.3e/appl/telnet/libtelnet/krb4encpwd.c
+--- heimdal-0.3e-old/appl/telnet/libtelnet/krb4encpwd.c	Fri Sep 17 06:41:34 1999
++++ heimdal-0.3e/appl/telnet/libtelnet/krb4encpwd.c	Wed Feb  7 12:24:43 2001
+@@ -74,7 +74,6 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ 
+-#include <des.h>
+ #include <krb.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff -ruN heimdal-0.3e-old/configure.in heimdal-0.3e/configure.in
+--- heimdal-0.3e-old/configure.in	Mon Feb  5 18:58:05 2001
++++ heimdal-0.3e/configure.in	Wed Feb  7 12:25:28 2001
+@@ -292,6 +292,7 @@
+ 	netinet/in_systm.h			\
+ 	netinet6/in6.h				\
+ 	netinfo/ni.h				\
++	openssl/crypto.h			\
+ 	paths.h					\
+ 	pthread.h				\
+ 	pty.h					\
+@@ -566,7 +567,10 @@
+ "$ac_cv_func_SHA1_Init" = "yes" -a \
+ "$ac_cv_func_RC4" = "yes"; then
+   DIR_des=''
+-  LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init"
++  if test "$krb4_libdir" != ""; then
++    LIB_des="-rpath $krb4_libdir -L$krb4_libdir"
++  fi
++  LIB_des="$LIB_des $ac_cv_funclib_MD4_Init"
+   LIB_des_appl="$LIB_des"
+ else
+   DIR_des='des'
+diff -ruN heimdal-0.3e-old/kadmin/kadmin_locl.h heimdal-0.3e/kadmin/kadmin_locl.h
+--- heimdal-0.3e-old/kadmin/kadmin_locl.h	Tue Sep 19 23:46:18 2000
++++ heimdal-0.3e/kadmin/kadmin_locl.h	Wed Feb  7 12:27:09 2001
+@@ -83,7 +83,11 @@
+ #endif
+ #include <err.h>
+ #include <roken.h>
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <krb5_locl.h>
+ #include <hdb.h>
+diff -ruN heimdal-0.3e-old/kadmin/random_password.c heimdal-0.3e/kadmin/random_password.c
+--- heimdal-0.3e-old/kadmin/random_password.c	Fri Dec  3 04:04:58 1999
++++ heimdal-0.3e/kadmin/random_password.c	Wed Feb  7 12:30:13 2001
+@@ -57,8 +57,9 @@
+ {
+ #ifdef OTP_STYLE
+     {
+-	des_cblock newkey;
++	OtpKey newkey;
+ 
++	krb5_generate_random_block(&newkey, sizeof(newkey));
+ 	des_new_random_key(&newkey);
+ 	otp_print_stddict (newkey, pw, len);
+ 	strlwr(pw);
+@@ -80,11 +81,11 @@
+ #ifndef OTP_STYLE
+ /* return a random value in range 0-127 */
+ static int
+-RND(des_cblock *key, int *left)
++RND(unsigned char *key, int keylen, int *left)
+ {
+     if(*left == 0){
+-	des_new_random_key(key);
+-	*left = 8;
++	krb5_generate_random_block(key, keylen);
++	*left = keylen;
+     }
+     (*left)--;
+     return ((unsigned char*)key)[*left];
+@@ -120,7 +121,7 @@
+     } *classes;
+     va_list ap;
+     int len, i;
+-    des_cblock rbuf; /* random buffer */
++    unsigned char rbuf[8]; /* random buffer */
+     int rleft = 0;
+ 
+     classes = malloc(num_classes * sizeof(*classes));
+@@ -138,11 +139,12 @@
+ 	return;
+     for(i = 0; i < len; i++) {
+ 	int j;
+-	int x = RND(&rbuf, &rleft) % (len - i);
++	int x = RND(rbuf, sizeof(rbuf), &rleft) % (len - i);
+ 	int t = 0;
+ 	for(j = 0; j < num_classes; j++) {
+ 	    if(x < t + classes[j].freq) {
+-		(*pw)[i] = classes[j].str[RND(&rbuf, &rleft) % classes[j].len];
++		(*pw)[i] = classes[j].str[RND(rbuf, sizeof(rbuf), &rleft) %
++		    classes[j].len];
+ 		classes[j].freq--;
+ 		break;
+ 	    }
+diff -ruN heimdal-0.3e-old/kdc/headers.h heimdal-0.3e/kdc/headers.h
+--- heimdal-0.3e-old/kdc/headers.h	Fri Aug  4 21:21:38 2000
++++ heimdal-0.3e/kdc/headers.h	Wed Feb  7 12:30:47 2001
+@@ -82,7 +82,11 @@
+ #include <getarg.h>
+ #include <base64.h>
+ #include <parse_units.h>
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <krb5_locl.h>
+ #include <hdb.h>
+diff -ruN heimdal-0.3e-old/kpasswd/kpasswd_locl.h heimdal-0.3e/kpasswd/kpasswd_locl.h
+--- heimdal-0.3e-old/kpasswd/kpasswd_locl.h	Fri Aug  4 21:22:51 2000
++++ heimdal-0.3e/kpasswd/kpasswd_locl.h	Wed Feb  7 12:31:32 2001
+@@ -95,7 +95,11 @@
+ #include <err.h>
+ #include <roken.h>
+ #include <getarg.h>
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ 
+ #endif /* __KPASSWD_LOCL_H__ */
+diff -ruN heimdal-0.3e-old/lib/hdb/hdb_locl.h heimdal-0.3e/lib/hdb/hdb_locl.h
+--- heimdal-0.3e-old/lib/hdb/hdb_locl.h	Tue Nov 14 17:57:17 2000
++++ heimdal-0.3e/lib/hdb/hdb_locl.h	Wed Feb  7 12:32:11 2001
+@@ -56,7 +56,11 @@
+ #endif
+ #include <roken.h>
+ 
++#ifdef HAVE_OPENSSL_DES_H
++#include <openssl/des.h>
++#else
+ #include <des.h>
++#endif
+ #include <krb5.h>
+ #include <hdb.h>
+ #include <hdb-private.h>
+diff -ruN heimdal-0.3e-old/lib/hdb/mkey.c heimdal-0.3e/lib/hdb/mkey.c
+--- heimdal-0.3e-old/lib/hdb/mkey.c	Tue Jan 30 12:20:57 2001
++++ heimdal-0.3e/lib/hdb/mkey.c	Wed Feb  7 12:32:36 2001
+@@ -437,9 +437,6 @@
+     if (ret)
+ 	return ret;
+     db->master_key = mkey;
+-#if 0 /* XXX - why? */
+-    des_set_random_generator_seed(key.keyvalue.data);
+-#endif
+     db->master_key_set = 1;
+     return 0;
+ }
+diff -ruN heimdal-0.3e-old/lib/krb5/crypto.c heimdal-0.3e/lib/krb5/crypto.c
+--- heimdal-0.3e-old/lib/krb5/crypto.c	Wed Jan 31 04:10:55 2001
++++ heimdal-0.3e/lib/krb5/crypto.c	Wed Feb  7 12:38:11 2001
+@@ -2532,6 +2532,71 @@
+  *                                                          *
+  ************************************************************/
+ 
++#ifdef HAVE_OPENSSL_DES_H
++/* From openssl/crypto/rand/rand_lcl.h */
++#define ENTROPY_NEEDED 20
++static int seed_something(void)
++{
++    int fd = -1;
++    size_t len;
++    char buf[1024], seedfile[256];
++
++    /* If there is a seed file, load it. But such a file cannot be trusted,
++       so use 0 for the entropy estimate */
++    if (RAND_file_name(seedfile, sizeof(seedfile))) {
++	fd = open(seedfile, O_RDONLY);
++	if (fd >= 0) {
++	    read(fd, buf, sizeof(buf));
++	    /* Use the full buffer anyway */
++	    RAND_add(buf, sizeof(buf), 0.0);
++	}
++	else
++	    seedfile[0] = '\0';
++    }
++    else
++	seedfile[0] = '\0';
++
++    /* Calling RAND_status() will try to use /dev/urandom if it exists so
++       we do not have to deal with it. */
++    if (RAND_status() != 1) {
++	krb5_context context;
++	char *p;
++
++	/* Try using egd */
++	if (!krb5_init_context(&context)) {
++	    p = krb5_config_get_string(context, NULL, "libdefaults",
++		"egd_socket", NULL);
++	    if (p != NULL)
++		RAND_egd_bytes(p, ENTROPY_NEEDED);
++	    krb5_free_context(context);
++	}
++    }
++    
++    if (RAND_status() == 1)	{
++	/* Update the seed file */
++	if (seedfile[0])
++	    RAND_write_file(seedfile);
++
++	return 0;
++    }
++    else
++	return -1;
++}
++
++void
++krb5_generate_random_block(void *buf, size_t len)
++{
++    static int rng_initialized = 0;
++    
++    if (!rng_initialized) {
++	if (seed_something())
++	    krb5_abortx(NULL, "Fatal: could not seed the random number generator");
++	
++	rng_initialized = 1;
++    }
++    RAND_bytes(buf, len);
++}
++#else
+ void
+ krb5_generate_random_block(void *buf, size_t len)
+ {
+@@ -2557,6 +2622,7 @@
+ 	buf = (char*)buf + sizeof(out);
+     }
+ }
++#endif
+ 
+ static void
+ DES3_postproc(krb5_context context,
+diff -ruN heimdal-0.3e-old/lib/krb5/krb5_locl.h heimdal-0.3e/lib/krb5/krb5_locl.h
+--- heimdal-0.3e-old/lib/krb5/krb5_locl.h	Mon Jan 29 13:09:00 2001
++++ heimdal-0.3e/lib/krb5/krb5_locl.h	Wed Feb  7 12:33:59 2001
+@@ -111,6 +111,7 @@
+ 
+ #ifdef HAVE_OPENSSL_DES_H
+ #include <openssl/des.h>
++#define des_new_random_key des_random_key
+ #else
+ #include <des.h>
+ #endif
--- heimdal-0.6.3.orig/debian/patches-0.3e/012_sharedlibs
+++ heimdal-0.6.3/debian/patches-0.3e/012_sharedlibs
@@ -0,0 +1,390 @@
+diff -ruN heimdal-0.3e-old/admin/Makefile.am heimdal-0.3e/admin/Makefile.am
+--- heimdal-0.3e-old/admin/Makefile.am	Sat Dec 16 11:16:45 2000
++++ heimdal-0.3e/admin/Makefile.am	Sat Jun 16 14:21:55 2001
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline)
++INCLUDES += $(INCLUDE_readline) $(INCLUDE_ss)
+ 
+ man_MANS = ktutil.8
+ 
+@@ -22,6 +22,6 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+diff -ruN heimdal-0.3e-old/admin/ktutil_locl.h heimdal-0.3e/admin/ktutil_locl.h
+--- heimdal-0.3e-old/admin/ktutil_locl.h	Sat Jun 16 14:21:54 2001
++++ heimdal-0.3e/admin/ktutil_locl.h	Sat Jun 16 14:21:55 2001
+@@ -64,7 +64,7 @@
+ #include <kadm5/admin.h>
+ #include <kadm5/kadm5_err.h>
+ 
+-#include <sl.h>
++#include <ss.h>
+ #include <getarg.h>
+ 
+ extern krb5_context context;
+diff -ruN heimdal-0.3e-old/cf/Makefile.am.common heimdal-0.3e/cf/Makefile.am.common
+--- heimdal-0.3e-old/cf/Makefile.am.common	Sat Jun 16 14:21:54 2001
++++ heimdal-0.3e/cf/Makefile.am.common	Sat Jun 16 14:21:55 2001
+@@ -10,7 +10,7 @@
+ 
+ CP	= cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ ## set build_HEADERZ to headers that should just be installed in build tree
+ 
+@@ -56,6 +56,13 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ LIB_readline = @LIB_readline@
++
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
+ 
+ LEXLIB = @LEXLIB@
+ 
+diff -ruN heimdal-0.3e-old/cf/krb-com_err.m4 heimdal-0.3e/cf/krb-com_err.m4
+--- heimdal-0.3e-old/cf/krb-com_err.m4	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3e/cf/krb-com_err.m4	Sat Jun 16 14:21:55 2001
+@@ -0,0 +1,35 @@
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_COM_ERR,[
++dnl com_err
++
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++AC_DEFINE(HAVE_COM_ERR, 1, 
++	[Define if you have a com_err compatible library.])dnl
++
++])
++AC_SUBST(COMPILE_ET)
+diff -ruN heimdal-0.3e-old/cf/krb-readline.m4 heimdal-0.3e/cf/krb-readline.m4
+--- heimdal-0.3e-old/cf/krb-readline.m4	Wed Nov 15 11:47:08 2000
++++ heimdal-0.3e/cf/krb-readline.m4	Sat Jun 16 14:21:55 2001
+@@ -28,16 +28,18 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init"
+ else
++	DIR_readline="editline"
+ 	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ AC_DEFINE(HAVE_READLINE, 1, 
+ 	[Define if you have a readline compatible library.])dnl
+ 
+-])
+\ No newline at end of file
++])
+diff -ruN heimdal-0.3e-old/cf/krb-ss.m4 heimdal-0.3e/cf/krb-ss.m4
+--- heimdal-0.3e-old/cf/krb-ss.m4	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3e/cf/krb-ss.m4	Sat Jun 16 14:23:47 2001
+@@ -0,0 +1,37 @@
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_SS,[
++dnl com_err
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++AC_DEFINE(HAVE_SS, 1, 
++	[Define if you have a ss compatible library.])dnl
++
++])
++AC_SUBST(LIB_sl)
+diff -ruN heimdal-0.3e-old/cf/test-package.m4 heimdal-0.3e/cf/test-package.m4
+--- heimdal-0.3e-old/cf/test-package.m4	Fri Dec 15 15:54:24 2000
++++ heimdal-0.3e/cf/test-package.m4	Sat Jun 16 14:21:56 2001
+@@ -2,7 +2,7 @@
+ dnl
+ dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+ 
+-AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
++AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
+ 
+ AC_DEFUN(AC_TEST_PACKAGE_NEW,[
+ AC_ARG_WITH($1,
+@@ -39,7 +39,7 @@
+ header_dirs=
+ lib_dirs=
+ d='$5'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -72,6 +72,7 @@
+ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+ 	$1_includedir="$ires"
+ 	$1_libdir="$lres"
++	DIR_$1=
+ 	INCLUDE_$1="-I$$1_includedir"
+ 	LIB_$1="-L$$1_libdir $3"
+ 	m4_ifval([$6],
+@@ -80,6 +81,7 @@
+ 	with_$1=yes
+ 	AC_MSG_RESULT([headers $ires, libraries $lres])
+ else
++	DIR_$1="$1"
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	with_$1=no
+@@ -88,6 +90,7 @@
+ dnl m4_ifval([$6],
+ dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
+ dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+diff -ruN heimdal-0.3e-old/configure.in heimdal-0.3e/configure.in
+--- heimdal-0.3e-old/configure.in	Sat Jun 16 14:21:54 2001
++++ heimdal-0.3e/configure.in	Sat Jun 16 14:21:56 2001
+@@ -231,6 +231,12 @@
+ [#include <stdio.h>
+  #include <readline.h>],-lreadline,,, READLINE)
+ 
++AC_TEST_PACKAGE_NEW(com_err,
++[#include <et/com_err.h>],-lcom_err,,, COM_ERR)
++
++AC_TEST_PACKAGE_NEW(ss,
++[#include <ss.h>],-lss,,, SS)
++
+ AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
+ 
+ KRB_C_BIGENDIAN
+@@ -585,6 +591,8 @@
+ AC_SUBST(LIB_des_appl)
+ 
+ KRB_READLINE
++KRB_COM_ERR
++KRB_SS
+ 
+ dnl telnet muck --------------------------------------------------
+ 
+diff -ruN heimdal-0.3e-old/include/ss/Makefile.am heimdal-0.3e/include/ss/Makefile.am
+--- heimdal-0.3e-old/include/ss/Makefile.am	Thu Jan  1 10:00:00 1970
++++ heimdal-0.3e/include/ss/Makefile.am	Sat Jun 16 14:21:56 2001
+@@ -0,0 +1,5 @@
++# $Id: Makefile.am,v 1.6 1999/03/20 13:58:17 joda Exp $
++
++include $(top_srcdir)/Makefile.am.common
++
++CLEANFILES = ss.h sl.h
+diff -ruN heimdal-0.3e-old/kadmin/Makefile.am heimdal-0.3e/kadmin/Makefile.am
+--- heimdal-0.3e-old/kadmin/Makefile.am	Thu Nov 16 09:51:12 2000
++++ heimdal-0.3e/kadmin/Makefile.am	Sat Jun 16 14:21:56 2001
+@@ -2,7 +2,7 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
+-INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) -I$(srcdir)/../lib/krb5
++INCLUDES += $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_ss) -I$(srcdir)/../lib/krb5
+ 
+ sbin_PROGRAMS = kadmin
+ 
+@@ -62,7 +62,7 @@
+ kadmin_LDADD = \
+ 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
+ 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(COMMON_LDADD) \
+ 	$(LIB_dlopen)
+diff -ruN heimdal-0.3e-old/kadmin/kadmin.c heimdal-0.3e/kadmin/kadmin.c
+--- heimdal-0.3e-old/kadmin/kadmin.c	Sat Jan 27 09:20:52 2001
++++ heimdal-0.3e/kadmin/kadmin.c	Sat Jun 16 14:21:56 2001
+@@ -32,7 +32,7 @@
+  */
+ 
+ #include "kadmin_locl.h"
+-#include <sl.h>
++#include <ss.h>
+ 
+ RCSID("$Id: kadmin.c,v 1.34 2001/01/26 22:20:52 joda Exp $");
+ 
+diff -ruN heimdal-0.3e-old/lib/Makefile.am heimdal-0.3e/lib/Makefile.am
+--- heimdal-0.3e-old/lib/Makefile.am	Thu Nov 16 10:11:05 2000
++++ heimdal-0.3e/lib/Makefile.am	Sat Jun 16 14:21:56 2001
+@@ -12,5 +12,5 @@
+ dir_dce = kdfs
+ endif
+ 
+-SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 @DIR_des@ krb5 \
++SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ asn1 @DIR_des@ krb5 \
+ 	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+diff -ruN heimdal-0.3e-old/lib/asn1/Makefile.am heimdal-0.3e/lib/asn1/Makefile.am
+--- heimdal-0.3e-old/lib/asn1/Makefile.am	Sat Jun 16 14:21:54 2001
++++ heimdal-0.3e/lib/asn1/Makefile.am	Sat Jun 16 14:21:56 2001
+@@ -2,6 +2,8 @@
+ 
+ include $(top_srcdir)/Makefile.am.common
+ 
++INCLUDES += $(INCLUDE_com_err)
++
+ YFLAGS = -d
+ 
+ lib_LTLIBRARIES = libasn1.la
+@@ -84,11 +86,11 @@
+ 	$(BUILT_SOURCES)
+ 
+ asn1_compile_LDADD = \
+-	$(LIB_roken) $(LEXLIB)
++        $(LIB_roken) $(LEXLIB)
+ 
+ check_der_LDADD = \
+ 	libasn1.la \
+-	../com_err/libcom_err.la \
++	$(LIB_com_err) \
+ 	$(LIB_roken)
+ 
+ asn1_print_LDADD = $(check_der_LDADD)
+diff -ruN heimdal-0.3e-old/lib/asn1/libasn1.h heimdal-0.3e/lib/asn1/libasn1.h
+--- heimdal-0.3e-old/lib/asn1/libasn1.h	Fri Dec  3 04:05:02 1999
++++ heimdal-0.3e/lib/asn1/libasn1.h	Sat Jun 16 14:21:56 2001
+@@ -47,4 +47,17 @@
+ #include "asn1_err.h"
+ #include <parse_units.h>
+ 
++#ifdef HACKED_AND_STUPID
++#define ASN1_BAD_TIMEFORMAT BAD_TIMEFORMAT
++#define ASN1_MISSING_FIELD MISSING_FIELD
++#define ASN1_MISPLACED_FIELD MISPLACED_FIELD
++#define ASN1_TYPE_MISMATCH TYPE_MISMATCH
++#define ASN1_OVERFLOW OVERFLOW
++#define ASN1_OVERRUN OVERRUN
++#define ASN1_BAD_ID BAD_ID
++#define ASN1_BAD_LENGTH BAD_LENGTH
++#define ASN1_BAD_FORMAT BAD_FORMAT
++#define ASN1_PARSE_ERROR PARSE_ERROR
++#endif
++
+ #endif /* __LIBASN1_H__ */
+diff -ruN heimdal-0.3e-old/lib/auth/sia/Makefile.am heimdal-0.3e/lib/auth/sia/Makefile.am
+--- heimdal-0.3e-old/lib/auth/sia/Makefile.am	Sat Jun 16 14:21:54 2001
++++ heimdal-0.3e/lib/auth/sia/Makefile.am	Sat Jun 16 14:21:56 2001
+@@ -24,7 +24,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.a		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
++	@LIB_sl@
+ 	$(top_builddir)/lib/roken/.libs/libroken.a	\
+ 	$(LIB_getpwnam_r)				\
+ 	-lc
+@@ -35,7 +35,7 @@
+ 	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
+ 	$(LIB_krb4)					\
+ 	$(top_builddir)/lib/des/.libs/libdes.so		\
+-	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
++	@LIB_sl@
+ 	$(top_builddir)/lib/roken/.libs/libroken.so	\
+ 	$(LIB_getpwnam_r)				\
+ 	-lc
+diff -ruN heimdal-0.3e-old/lib/sl/Makefile.am heimdal-0.3e/lib/sl/Makefile.am
+--- heimdal-0.3e-old/lib/sl/Makefile.am	Sat Jun 16 14:21:54 2001
++++ heimdal-0.3e/lib/sl/Makefile.am	Sat Jun 16 14:21:56 2001
+@@ -4,8 +4,6 @@
+ 
+ YFLAGS = -d
+ 
+-include_HEADERS = sl.h
+-
+ lib_LTLIBRARIES = libsl.la libss.la
+ libsl_la_LDFLAGS = -version-info 1:1:1 -no-undefined
+ libss_la_LDFLAGS = -version-info 1:3:1 -no-undefined
+@@ -31,7 +29,21 @@
+ EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
+ 
+ ssincludedir = $(includedir)/ss
+-ssinclude_HEADERS = ss.h
++buildssinclude = $(buildinclude)/ss
++ssinclude_HEADERS = sl.h ss.h
++
++install-build-headers:: $(ssinclude_HEADERS)
++	@foo='$(ssinclude_HEADERS)'; \
++	for f in $$foo; do \
++		f=`basename $$f`; \
++		if test -f "$(srcdir)/$$f"; then file="$(srcdir)/$$f"; \
++		else file="$$f"; fi; \
++		if cmp -s  $$file $(buildssinclude)/$$f 2> /dev/null ; then \
++		: ; else \
++			echo "cp $$file $(buildssinclude)/$$f";\
++			cp $$file $(buildssinclude)/$$f; \
++		fi ; \
++	done
+ 
+ CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
+ 
--- heimdal-0.6.3.orig/debian/patches-0.3e/013_maildir
+++ heimdal-0.6.3/debian/patches-0.3e/013_maildir
@@ -0,0 +1,40 @@
+Index: heimdal-0.3e/appl/popper/pop_pass.c
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/popper/pop_pass.c,v
+retrieving revision 1.1.1.3
+retrieving revision 1.5
+diff -c -r1.1.1.3 -r1.5
+*** heimdal-0.3e/appl/popper/pop_pass.c 2000/05/19 05:23:42 1.1.1.3
+--- heimdal-0.3e/appl/popper/pop_pass.c	2000/05/19 05:33:06	1.5
+***************
+*** 197,203 ****
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+!     snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
+--- 197,218 ----
+  	    p->ipaddr, p->user);
+  
+      /*  Build the name of the user's maildrop */
+! 
+!     /* Try ~/Maildir */
+!     if (pw->pw_dir != NULL)
+! 	{
+!         snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Maildir");
+! 	}
+!     if(pw->pw_dir != NULL && stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try ~/Mailbox */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Mailbox");
+! 	}
+!     if(pw->pw_dir == NULL || stat(p->drop_name, &st) < 0)
+! 	{
+!     	/* else try /var/spool/mail/userid */
+! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
+! 	}
+  
+      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
+  	/*  Make a temporary copy of the user's maildrop */
--- heimdal-0.6.3.orig/debian/patches-0.3e/014_cache
+++ heimdal-0.6.3/debian/patches-0.3e/014_cache
@@ -0,0 +1,63 @@
+--- heimdal-0.3e/lib/krb5/cache.c.orig-heimdal	Tue Nov 14 18:41:58 2000
++++ heimdal-0.3e/lib/krb5/cache.c	Tue Nov 14 19:02:07 2000
+@@ -89,11 +89,24 @@
+ {
+     krb5_error_code ret;
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc(sizeof(*p));
+     if(p == NULL)
+ 	return KRB5_CC_NOMEM;
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL)
++        return KRB5_CC_NOMEM;
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL)
++    {
++        free(q);
++        return KRB5_CC_NOMEM;
++    }
++    
++    p->ops = q;
+     *id = p;
+     ret = p->ops->resolve(context, id, residual);
+     if(ret)
+@@ -141,11 +154,24 @@
+ 		krb5_ccache *id)
+ {
+     krb5_ccache p;
++    krb5_cc_ops *q;
+ 
+     p = malloc (sizeof(*p));
+     if (p == NULL)
+ 	return KRB5_CC_NOMEM;
+-    p->ops = ops;
++
++    q = malloc(sizeof(*q));
++    if(q == NULL)
++        return KRB5_CC_NOMEM;
++    memcpy(q, ops, sizeof(*q));
++    q->prefix = strdup(ops->prefix);
++    if(q->prefix == NULL)
++    {
++        free(q);
++        return KRB5_CC_NOMEM;
++    }
++    
++    p->ops = q;
+     *id = p;
+     return p->ops->gen_new(context, id);
+ }
+@@ -248,6 +274,8 @@
+ {
+     krb5_error_code ret;
+     ret = id->ops->close(context, id);
++    free(id->ops->prefix);
++    free((krb5_cc_ops *)id->ops);
+     free(id);
+     return ret;
+ }
--- heimdal-0.6.3.orig/debian/patches-0.3e/015_ftp
+++ heimdal-0.6.3/debian/patches-0.3e/015_ftp
@@ -0,0 +1,25 @@
+diff -ruN heimdal-0.3e-old/appl/ftp/ftp/cmds.c heimdal-0.3e/appl/ftp/ftp/cmds.c
+--- heimdal-0.3e-old/appl/ftp/ftp/cmds.c	Tue Jul 18 20:00:31 2000
++++ heimdal-0.3e/appl/ftp/ftp/cmds.c	Wed Jan 10 13:29:04 2001
+@@ -81,7 +81,7 @@
+ setpeer(int argc, char **argv)
+ {
+ 	char *host;
+-	short port;
++	unsigned short port;
+ 	struct servent *sp;
+ 
+ 	if (connected) {
+@@ -103,12 +103,6 @@
+ 	port = sp->s_port;
+ 	if (argc > 2) {
+ 		port = atoi(argv[2]);
+-		if (port <= 0) {
+-			printf("%s: bad port number-- %s\n", argv[1], argv[2]);
+-			printf ("usage: %s host-name [port]\n", argv[0]);
+-			code = -1;
+-			return;
+-		}
+ 		port = htons(port);
+ 	}
+ 	host = hookup(argv[1], port);
--- heimdal-0.6.3.orig/debian/patches-0.3e/016_afs
+++ heimdal-0.6.3/debian/patches-0.3e/016_afs
@@ -0,0 +1,67 @@
+diff -ruN heimdal-0.3e-old/configure.in heimdal-0.3e/configure.in
+--- heimdal-0.3e-old/configure.in	Sat Jun 16 14:39:55 2001
++++ heimdal-0.3e/configure.in	Sat Jun 16 14:40:45 2001
+@@ -579,7 +579,7 @@
+   if test "$krb4_libdir" != ""; then
+     LIB_des="-rpath $krb4_libdir -L$krb4_libdir"
+   fi
+-  LIB_des="$LIB_des $ac_cv_funclib_MD4_Init"
++  LIB_des="$LIB_des -ldes $ac_cv_funclib_MD4_Init"
+   LIB_des_appl="$LIB_des"
+ else
+   DIR_des='des'
+diff -ruN heimdal-0.3e-old/kdc/kaserver.c heimdal-0.3e/kdc/kaserver.c
+--- heimdal-0.3e-old/kdc/kaserver.c	Mon Jan 29 08:51:05 2001
++++ heimdal-0.3e/kdc/kaserver.c	Sat Jun 16 14:39:56 2001
+@@ -37,7 +37,6 @@
+ 
+ #ifdef KASERVER
+ 
+-#include "kerberos4.h"
+ #include <rx.h>
+ 
+ #define KA_AUTHENTICATION_SERVICE 731
+@@ -406,8 +405,8 @@
+     snprintf (client_name, sizeof(client_name), "%s.%s@%s",
+ 	      name, instance, v4_realm);
+ 
+-    client_entry = db_fetch4 (name, instance, v4_realm);
+-    if (client_entry == NULL) {
++    ret = db_fetch4 (name, instance, v4_realm, &client_entry);
++    if (ret) {
+ 	kdc_log(0, "Client not found in database: %s",
+ 		client_name);
+ 	make_error_reply (hdr, KANOENT, reply);
+@@ -417,8 +416,8 @@
+     snprintf (server_name, sizeof(server_name), "%s.%s@%s",
+ 	      "krbtgt", v4_realm, v4_realm);
+ 
+-    server_entry = db_fetch4 ("krbtgt", v4_realm, v4_realm);
+-    if (server_entry == NULL) {
++    ret = db_fetch4 ("krbtgt", v4_realm, v4_realm, &server_entry);
++    if (ret) {
+ 	kdc_log(0, "Server not found in database: %s", server_name);
+ 	make_error_reply (hdr, KANOENT, reply);
+ 	goto out;
+@@ -599,8 +598,8 @@
+     snprintf (server_name, sizeof(server_name),
+ 	      "%s.%s@%s", name, instance, v4_realm);
+ 
+-    server_entry = db_fetch4 (name, instance, v4_realm);
+-    if (server_entry == NULL) {
++    ret = db_fetch4 (name, instance, v4_realm, &server_entry);
++    if (ret) {
+ 	kdc_log(0, "Server not found in database: %s", server_name);
+ 	make_error_reply (hdr, KANOENT, reply);
+ 	goto out;
+@@ -614,8 +613,8 @@
+ 	goto out;
+     }
+ 
+-    krbtgt_entry = db_fetch4 ("krbtgt", v4_realm, v4_realm);
+-    if (krbtgt_entry == NULL) {
++    ret = db_fetch4 ("krbtgt", v4_realm, v4_realm, &krbtgt_entry);
++    if (ret) {
+ 	kdc_log(0, "Server not found in database: %s.%s@%s",
+ 		"krbtgt", v4_realm, v4_realm);
+ 	make_error_reply (hdr, KANOENT, reply);
--- heimdal-0.6.3.orig/debian/patches-0.3e/021_debian
+++ heimdal-0.6.3/debian/patches-0.3e/021_debian
@@ -0,0 +1,50 @@
+Index: heimdal-0.3e/appl/telnet/telnetd/telnetd.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/telnetd/telnetd.h,v
+retrieving revision 1.1.1.2
+retrieving revision 1.2
+diff -c -r1.1.1.2 -r1.2
+*** heimdal-0.3e/appl/telnet/telnetd/telnetd.h 1999/07/24 08:24:26 1.1.1.2
+--- appl/telnet/telnetd/telnetd.h	2000/01/06 09:22:48	1.2
+***************
+*** 193,199 ****
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	BINDIR "/login"
+  
+  /* fallbacks */
+  
+--- 193,199 ----
+  #endif
+  
+  #undef _PATH_LOGIN
+! #define _PATH_LOGIN	LIBEXECDIR "/login"
+  
+  /* fallbacks */
+  
+Index: heimdal-0.3e/lib/hdb/hdb.h
+===================================================================
+RCS file: /homes/bam/cvsroot/debian/heimdal/lib/hdb/hdb.h,v
+retrieving revision 1.1.1.4
+retrieving revision 1.3
+diff -c -r1.1.1.4 -r1.3
+*** heimdal-0.3e/lib/hdb/hdb.h 2000/07/31 03:16:43 1.1.1.4
+--- heimdal-0.3e/lib/hdb/hdb.h	2000/07/31 03:22:57	1.3
+***************
+*** 78,84 ****
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/heimdal"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
+--- 78,84 ----
+      krb5_error_code (*destroy)(krb5_context, struct HDB*);
+  }HDB;
+  
+! #define HDB_DB_DIR "/var/lib/heimdal-kdc"
+  #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
+  #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
+  
--- heimdal-0.6.3.orig/debian/patches-0.3e/030_autotools
+++ heimdal-0.6.3/debian/patches-0.3e/030_autotools
@@ -0,0 +1,35858 @@
+diff -ruN heimdal-0.3e-old/Makefile.in heimdal-0.3e/Makefile.in
+--- heimdal-0.3e-old/Makefile.in	Mon Feb  5 18:58:14 2001
++++ heimdal-0.3e/Makefile.in	Sat Jun 16 15:14:45 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -234,17 +245,17 @@
+ 		cf/find-func.m4 cf/find-if-not-broken.m4 \
+ 		cf/grok-type.m4 cf/have-pragma-weak.m4 \
+ 		cf/have-struct-field.m4 cf/have-type.m4 \
+-		cf/have-types.m4 cf/krb-bigendian.m4 cf/krb-find-db.m4 \
+-		cf/krb-func-getcwd-broken.m4 cf/krb-func-getlogin.m4 \
+-		cf/krb-ipv6.m4 cf/krb-irix.m4 cf/krb-prog-ln-s.m4 \
+-		cf/krb-prog-ranlib.m4 cf/krb-prog-yacc.m4 \
+-		cf/krb-readline.m4 cf/krb-struct-spwd.m4 \
+-		cf/krb-struct-winsize.m4 cf/krb-sys-aix.m4 \
+-		cf/krb-sys-nextstep.m4 cf/krb-version.m4 cf/mips-abi.m4 \
+-		cf/misc.m4 cf/need-proto.m4 cf/osfc2.m4 \
+-		cf/proto-compat.m4 cf/retsigtype.m4 cf/roken-frag.m4 \
+-		cf/roken.m4 cf/shared-libs.m4 cf/test-package.m4 \
+-		cf/wflags.m4
++		cf/have-types.m4 cf/krb-bigendian.m4 cf/krb-com_err.m4 \
++		cf/krb-find-db.m4 cf/krb-func-getcwd-broken.m4 \
++		cf/krb-func-getlogin.m4 cf/krb-ipv6.m4 cf/krb-irix.m4 \
++		cf/krb-prog-ln-s.m4 cf/krb-prog-ranlib.m4 \
++		cf/krb-prog-yacc.m4 cf/krb-readline.m4 cf/krb-ss.m4 \
++		cf/krb-struct-spwd.m4 cf/krb-struct-winsize.m4 \
++		cf/krb-sys-aix.m4 cf/krb-sys-nextstep.m4 \
++		cf/krb-version.m4 cf/mips-abi.m4 cf/misc.m4 \
++		cf/need-proto.m4 cf/osfc2.m4 cf/proto-compat.m4 \
++		cf/retsigtype.m4 cf/roken-frag.m4 cf/roken.m4 \
++		cf/shared-libs.m4 cf/test-package.m4 cf/wflags.m4
+ 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+@@ -285,10 +296,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -367,6 +379,7 @@
+ 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ 	  && test `find $$dc_install_base -type f -print | wc -l` -le 1 \
++	  && chmod -R u+w .. \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+ 	  && $(MAKE) $(AM_MAKEFLAGS) distclean \
+ 	  && rm -f $(distdir).tar.gz \
+diff -ruN heimdal-0.3e-old/acinclude.m4 heimdal-0.3e/acinclude.m4
+--- heimdal-0.3e-old/acinclude.m4	Sun May 24 00:54:53 1998
++++ heimdal-0.3e/acinclude.m4	Sat Jun 16 15:14:27 2001
+@@ -7,3 +7,5 @@
+ dnl $xId: misc.m4,v 1.1 1997/12/14 15:59:04 joda Exp $
+ dnl
+ define(upcase,`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl
++dnl Hack to allow old CVS version of autoconf to work.
++define([m4_ifval],[ifval])dnl
+diff -ruN heimdal-0.3e-old/aclocal.m4 heimdal-0.3e/aclocal.m4
+--- heimdal-0.3e-old/aclocal.m4	Mon Feb  5 18:58:10 2001
++++ heimdal-0.3e/aclocal.m4	Sat Jun 16 15:14:27 2001
+@@ -1,14 +1,15 @@
+-dnl ./aclocal.m4 generated automatically by aclocal 1.4a
++# aclocal.m4 generated automatically by aclocal 1.4a
+ 
+-dnl Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl This program is distributed in the hope that it will be useful,
+-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-dnl PARTICULAR PURPOSE.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
++# Free Software Foundation, Inc.
++# This file 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.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
+ 
+ dnl $Id: acinclude.m4,v 1.15 1998/05/23 14:54:53 joda Exp $
+ dnl
+@@ -19,6 +20,8 @@
+ dnl $xId: misc.m4,v 1.1 1997/12/14 15:59:04 joda Exp $
+ dnl
+ define(upcase,`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`)dnl
++dnl Hack to allow old CVS version of autoconf to work.
++define([m4_ifval],[ifval])dnl
+ 
+ dnl $Id: misc.m4,v 1.2 2000/07/19 15:04:00 joda Exp $
+ dnl
+@@ -49,32 +52,40 @@
+ ])])
+ # Like AC_CONFIG_HEADER, but automatically create stamp file.
+ 
+-AC_DEFUN(AM_CONFIG_HEADER,
+-[AC_PREREQ([2.12])
+-AC_CONFIG_HEADER([$1])
+-dnl When config.status generates a header, we must update the stamp-h file.
+-dnl This file resides in the same directory as the config header
+-dnl that is generated.  We must strip everything past the first ":",
+-dnl and everything past the last "/".
+-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+-<<am_indx=1
+-for am_file in <<$1>>; do
+-  case " <<$>>CONFIG_HEADERS " in
+-  *" <<$>>am_file "*<<)>>
+-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+-    ;;
+-  esac
+-  am_indx=`expr "<<$>>am_indx" + 1`
+-done<<>>dnl>>)
+-changequote([,]))])
++# serial 3
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  We must strip everything past the first ":",
++# and everything past the last "/".
++
++AC_PREREQ([2.12])
++
++AC_DEFUN([AM_CONFIG_HEADER],
++[AC_CONFIG_HEADER([$1])
++  AC_OUTPUT_COMMANDS(
++   ifelse(patsubst([$1], [[^ ]], []),
++	  [],
++	  [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
++	   patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),
++  [am_indx=1
++  for am_file in $1; do
++    case " $CONFIG_HEADERS " in
++    *" $am_file "*)
++      echo timestamp > `echo $am_file | sed 's%:.*%%;s%[^/]*$%%'`stamp-h$am_indx
++      ;;
++    esac
++    am_indx=\`expr \$am_indx + 1\`
++  done])
++])
+ 
+ # Do all the work for Automake.  This macro actually does too much --
+ # some checks are only needed if your package does certain things.
+ # But this isn't really a big deal.
+ 
+-# serial 2
++# serial 3
++
++AC_PREREQ([2.13])
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+@@ -92,12 +103,11 @@
+ 
+ # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE])
+ # ----------------------------------------------
+-AC_DEFUN(AM_INIT_AUTOMAKE,
++AC_DEFUN([AM_INIT_AUTOMAKE],
+ [dnl We require 2.13 because we rely on SHELL being computed by configure.
+-AC_PREREQ([2.13])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ # test to see if srcdir already configured
+-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
++if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
+    test -f $srcdir/config.status; then
+   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+@@ -121,8 +131,8 @@
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+ AM_MISSING_PROG(AMTAR, tar)
+ AM_MISSING_INSTALL_SH
+-dnl We need awk for the "check" target.  The system "awk" is bad on
+-dnl some platforms.
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
+ AC_REQUIRE([AC_PROG_AWK])dnl
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_DEP_TRACK])dnl
+@@ -141,7 +151,7 @@
+ # Check to make sure that the build environment is sane.
+ #
+ 
+-AC_DEFUN(AM_SANITY_CHECK,
++AC_DEFUN([AM_SANITY_CHECK],
+ [AC_MSG_CHECKING([whether build environment is sane])
+ # Just in case
+ sleep 1
+@@ -180,15 +190,15 @@
+ rm -f conftest*
+ AC_MSG_RESULT(yes)])
+ 
+-dnl AM_MISSING_PROG(NAME, PROGRAM)
+-AC_DEFUN(AM_MISSING_PROG, [
++# AM_MISSING_PROG(NAME, PROGRAM)
++AC_DEFUN([AM_MISSING_PROG], [
+ AC_REQUIRE([AM_MISSING_HAS_RUN])
+ $1=${$1-"${am_missing_run}$2"}
+ AC_SUBST($1)])
+ 
+-dnl Like AM_MISSING_PROG, but only looks for install-sh.
+-dnl AM_MISSING_INSTALL_SH()
+-AC_DEFUN(AM_MISSING_INSTALL_SH, [
++# Like AM_MISSING_PROG, but only looks for install-sh.
++# AM_MISSING_INSTALL_SH()
++AC_DEFUN([AM_MISSING_INSTALL_SH], [
+ AC_REQUIRE([AM_MISSING_HAS_RUN])
+ if test -z "$install_sh"; then
+    install_sh="$ac_aux_dir/install-sh"
+@@ -200,13 +210,13 @@
+ fi
+ AC_SUBST(install_sh)])
+ 
+-dnl AM_MISSING_HAS_RUN.
+-dnl Define MISSING if not defined so far and test if it supports --run.
+-dnl If it does, set am_missing_run to use it, otherwise, to nothing.
++# AM_MISSING_HAS_RUN.
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN], [
+ test x"${MISSING+set}" = xset || \
+-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+-dnl Use eval to expand $SHELL
++  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
++# Use eval to expand $SHELL
+ if eval "$MISSING --run :"; then
+   am_missing_run="$MISSING --run "
+ else
+@@ -216,14 +226,14 @@
+ fi
+ ])
+ 
+-dnl See how the compiler implements dependency checking.
+-dnl Usage:
+-dnl AM_DEPENDENCIES(NAME)
+-dnl NAME is "CC", "CXX" or "OBJC".
++# See how the compiler implements dependency checking.
++# Usage:
++# AM_DEPENDENCIES(NAME)
++# NAME is "CC", "CXX" or "OBJC".
+ 
+-dnl We try a few techniques and use that to set a single cache variable.
++# We try a few techniques and use that to set a single cache variable.
+ 
+-AC_DEFUN(AM_DEPENDENCIES,[
++AC_DEFUN([AM_DEPENDENCIES],[
+ AC_REQUIRE([AM_SET_DEPDIR])
+ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])
+ ifelse([$1],CC,[
+@@ -259,10 +269,13 @@
+       ;;
+     none) break ;;
+     esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
+     if depmode="$depmode" \
+        source=conftest.c object=conftest.o \
+        depfile=conftest.Po tmpdepfile=conftest.TPo \
+-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
++       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
+        grep conftest.h conftest.Po > /dev/null 2>&1; then
+       am_cv_[$1]_dependencies_compiler_type="$depmode"
+       break
+@@ -279,10 +292,10 @@
+ AC_SUBST([$1]DEPMODE)
+ ])
+ 
+-dnl Choose a directory name for dependency files.
+-dnl This macro is AC_REQUIREd in AM_DEPENDENCIES
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in AM_DEPENDENCIES
+ 
+-AC_DEFUN(AM_SET_DEPDIR,[
++AC_DEFUN([AM_SET_DEPDIR],[
+ if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+   DEPDIR=.deps
+ else
+@@ -291,7 +304,7 @@
+ AC_SUBST(DEPDIR)
+ ])
+ 
+-AC_DEFUN(AM_DEP_TRACK,[
++AC_DEFUN([AM_DEP_TRACK],[
+ AC_ARG_ENABLE(dependency-tracking,
+ [  --disable-dependency-tracking Speeds up one-time builds
+   --enable-dependency-tracking  Do not reject slow dependency extractors])
+@@ -316,16 +329,16 @@
+ popdef([subst])
+ ])
+ 
+-dnl Generate code to set up dependency tracking.
+-dnl This macro should only be invoked once -- use via AC_REQUIRE.
+-dnl Usage:
+-dnl AM_OUTPUT_DEPENDENCY_COMMANDS
++# Generate code to set up dependency tracking.
++# This macro should only be invoked once -- use via AC_REQUIRE.
++# Usage:
++# AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+-dnl
+-dnl This code is only required when automatic dependency tracking
+-dnl is enabled.  FIXME.  This creates each `.P' file that we will
+-dnl need in order to bootstrap the dependency handling code.
+-AC_DEFUN(AM_OUTPUT_DEPENDENCY_COMMANDS,[
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],[
+ AC_OUTPUT_COMMANDS([
+ test x"$AMDEP" != x"" ||
+ for mf in $CONFIG_FILES; do
+@@ -368,9 +381,9 @@
+ ac_aux_dir="$ac_aux_dir"])])
+ 
+ 
+-dnl AM_PROG_LEX
+-dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+-AC_DEFUN(AM_PROG_LEX,
++# AM_PROG_LEX
++# Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
++AC_DEFUN([AM_PROG_LEX],
+ [AC_REQUIRE([AM_MISSING_HAS_RUN])
+ AC_CHECK_PROGS(LEX, flex lex, [${am_missing_run}flex])
+ AC_PROG_LEX
+@@ -493,212 +506,2799 @@
+ esac
+ ])
+ 
+-dnl
+-dnl $Id: c-attribute.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
+-dnl
++dnl
++dnl $Id: c-attribute.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
++dnl
++
++dnl
++dnl Test for __attribute__
++dnl
++
++AC_DEFUN(AC_C___ATTRIBUTE__, [
++AC_MSG_CHECKING(for __attribute__)
++AC_CACHE_VAL(ac_cv___attribute__, [
++AC_TRY_COMPILE([
++#include <stdlib.h>
++],
++[
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++],
++ac_cv___attribute__=yes,
++ac_cv___attribute__=no)])
++if test "$ac_cv___attribute__" = "yes"; then
++  AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
++fi
++AC_MSG_RESULT($ac_cv___attribute__)
++])
++
++
++# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
++
++# serial 46 AC_PROG_LIBTOOL
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])
++
++AC_DEFUN([AC_LIBTOOL_SETUP],
++[AC_PREREQ(2.13)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++
++_LT_AC_PROG_ECHO_BACKSLASH
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
++
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
++
++ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
++
++AC_ARG_ENABLE(libtool-lock,
++  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_SAVE
++     AC_LANG_C
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_RESTORE])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++
++  # recent cygwin and mingw systems supply a stub DllMain which the user
++  # can override, but on older systems we have to supply one
++  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
++    [AC_TRY_LINK([],
++      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
++      DllMain (0, 0, 0);],
++      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
++
++  case $host/$CC in
++  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
++    # old mingw systems require "-dll" to link a DLL, while more recent ones
++    # require "-mdll"
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS -mdll"
++    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
++      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
++    CFLAGS="$SAVE_CFLAGS" ;;
++  *-*-cygwin* | *-*-pw32*)
++    # cygwin systems need to pass --dll to the linker, and not link
++    # crt.o which will require a WinMain@16 definition.
++    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
++  esac
++  ;;
++  ])
++esac
++
++_LT_AC_LTCONFIG_HACK
++
++])
++
++# _LT_AC_CHECK_DLFCN
++# --------------------
++AC_DEFUN(_LT_AC_CHECK_DLFCN,
++[AC_CHECK_HEADERS(dlfcn.h)
++])# _LT_AC_CHECK_DLFCN
++
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++[symcode='[BCDEGRST]']
++
++# Regexp to match symbols that can be accessed directly from C.
++[sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  [symcode='[BCDT]']
++  ;;
++cygwin* | mingw* | pw32*)
++  [symcode='[ABCDGISTW]']
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  ;;
++irix*)
++  [symcode='[BCDEGRST]']
++  ;;
++solaris* | sysv5*)
++  [symcode='[BDT]']
++  ;;
++sysv4)
++  [symcode='[DFNSTU]']
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $host_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  [symcode='[ABCDGISTW]']
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++[lt_preloaded_symbols[] =]
++{
++EOF
++	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$save_LIBS"
++	  CFLAGS="$save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
++    fi
++  else
++    echo "$progname: failed program was:" >&AC_FD_CC
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++else
++  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
++fi
++if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++
++# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++# ---------------------------------
++AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
++[# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
++fi
++])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn;t interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++                              [AC_DIVERT_PUSH(NOTICE)])
++_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
++
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(ECHO)
++AC_DIVERT_POP
++])# _LT_AC_PROG_ECHO_BACKSLASH
++
++# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
++#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
++# ------------------------------------------------------------------
++AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
++[if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}]
++EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_unknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
++  fi
++fi
++rm -fr conftest*
++])# _LT_AC_TRY_DLOPEN_SELF
++
++# AC_LIBTOOL_DLOPEN_SELF
++# -------------------
++AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
++[if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  *)
++    AC_CHECK_LIB(dl, dlopen,  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++      [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
++        [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
++          [AC_CHECK_LIB(svld, dlopen,
++	    [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++            [AC_CHECK_LIB(dld, shl_load,
++              [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	    ])
++          ])
++        ])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
++
++AC_DEFUN([_LT_AC_LTCONFIG_HACK],
++[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++need_locks="$enable_libtool_lock"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++if test x"$host" != x"$build"; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case $host_os in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="[$]2"
++
++AC_MSG_CHECKING([for objdir])
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++AC_MSG_RESULT($objdir)
++
++
++AC_ARG_WITH(pic, 
++[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
++pic_mode="$withval", pic_mode=default)
++test -z "$pic_mode" && pic_mode=default
++
++# We assume here that the value for lt_cv_prog_cc_pic will not be cached
++# in isolation, and that seeing it set (from the cache) indicates that
++# the associated values are set (in the cache) correctly too.
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++AC_CACHE_VAL(lt_cv_prog_cc_pic,
++[ lt_cv_prog_cc_pic=
++  lt_cv_prog_cc_shlib=
++  lt_cv_prog_cc_wl=
++  lt_cv_prog_cc_static=
++  lt_cv_prog_cc_no_builtin=
++  lt_cv_prog_cc_can_build_shared=$can_build_shared
++
++  if test "$GCC" = yes; then
++    lt_cv_prog_cc_wl='-Wl,'
++    lt_cv_prog_cc_static='-static'
++
++    case $host_os in
++    aix*)
++      # Below there is a dirty hack to force normal static linking with -ldl
++      # The problem is because libdl dynamically linked with both libc and
++      # libC (AIX C++ library), which obviously doesn't included in libraries
++      # list by gcc. This cause undefined symbols with -static flags.
++      # This hack allows C programs to be linked with "-static -ldl", but
++      # we not sure about C++ programs.
++      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_cv_prog_cc_pic='-fno-common'
++      ;;
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	 lt_cv_prog_cc_pic=-Kconform_pic
++      fi
++      ;;
++    *)
++      lt_cv_prog_cc_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for PIC flags for the system compiler.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++        # AIX 5 now supports IA64 processor
++        lt_cv_prog_cc_static='-Bstatic'
++        lt_cv_prog_cc_wl='-Wl,'
++      else
++        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
++      lt_cv_prog_cc_pic='+Z'
++      ;;
++
++    irix5* | irix6*)
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      # PIC (with -KPIC) is the default.
++      ;;
++
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++
++    newsos6)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    osf3* | osf4* | osf5*)
++      # All OSF/1 code is PIC.
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_cv_prog_cc_pic='-Kpic'
++      lt_cv_prog_cc_static='-dn'
++      lt_cv_prog_cc_shlib='-belf'
++      ;;
++
++    solaris*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    sunos4*)
++      lt_cv_prog_cc_pic='-PIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Qoption ld '
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      if test "x$host_vendor" = xsni; then
++        lt_cv_prog_cc_wl='-LD'
++      else
++        lt_cv_prog_cc_wl='-Wl,'
++      fi
++      ;;
++
++    uts4*)
++      lt_cv_prog_cc_pic='-pic'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_cv_prog_cc_pic='-Kconform_pic'
++	lt_cv_prog_cc_static='-Bstatic'
++      fi
++      ;;
++
++    *)
++      lt_cv_prog_cc_can_build_shared=no
++      ;;
++    esac
++  fi
++])
++if test -z "$lt_cv_prog_cc_pic"; then
++  AC_MSG_RESULT([none])
++else
++  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
++
++  # Check to make sure the pic_flag actually works.
++  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
++  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
++    save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
++    AC_TRY_COMPILE([], [], [dnl
++      case $host_os in
++      hpux9* | hpux10* | hpux11*)
++	# On HP-UX, both CC and GCC only warn that PIC is supported... then
++	# they create non-PIC objects.  So, if there were any warnings, we
++	# assume that PIC is not supported.
++	if test -s conftest.err; then
++	  lt_cv_prog_cc_pic_works=no
++	else
++	  lt_cv_prog_cc_pic_works=yes
++	fi
++	;;
++      *)
++	lt_cv_prog_cc_pic_works=yes
++	;;
++      esac
++    ], [dnl
++      lt_cv_prog_cc_pic_works=no
++    ])
++    CFLAGS="$save_CFLAGS"
++  ])
++
++  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
++    lt_cv_prog_cc_pic=
++    lt_cv_prog_cc_can_build_shared=no
++  else
++    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  fi
++
++  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
++fi
++
++# Check for any special shared library compilation flags.
++if test -n "$lt_cv_prog_cc_shlib"; then
++  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
++  if echo "$old_CC $old_CFLAGS " | [egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]"] >/dev/null; then :
++  else
++   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
++AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
++  lt_cv_prog_cc_static_works=no
++  save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
++  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
++  LDFLAGS="$save_LDFLAGS"
++])
++
++# Belt *and* braces to stop my trousers falling down:
++test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
++AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
++
++pic_flag="$lt_cv_prog_cc_pic"
++special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
++wl="$lt_cv_prog_cc_wl"
++link_static_flag="$lt_cv_prog_cc_static"
++no_builtin_flag="$lt_cv_prog_cc_no_builtin"
++can_build_shared="$lt_cv_prog_cc_can_build_shared"
++
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
++AC_CACHE_VAL([lt_cv_compiler_c_o], [
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++echo "int some_variable = 0;" > conftest.$ac_ext
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
++compiler_c_o=no
++if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++  if test -s out/conftest.err; then
++    lt_cv_compiler_c_o=no
++  else
++    lt_cv_compiler_c_o=yes
++  fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&AC_FD_CC
++  lt_cv_compiler_c_o=no
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++])
++compiler_c_o=$lt_cv_compiler_c_o
++AC_MSG_RESULT([$compiler_c_o])
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
++  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
++  lt_cv_compiler_o_lo=no
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      lt_cv_compiler_o_lo=no
++    else
++      lt_cv_compiler_o_lo=yes
++    fi
++  ])
++  CFLAGS="$save_CFLAGS"
++  ])
++  compiler_o_lo=$lt_cv_compiler_o_lo
++  AC_MSG_RESULT([$compiler_c_lo])
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$GCC" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
++  compiler_rtti_exceptions=no
++  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      compiler_rtti_exceptions=no
++    else
++      compiler_rtti_exceptions=yes
++    fi
++  ])
++  CFLAGS="$save_CFLAGS"
++  AC_MSG_RESULT([$compiler_rtti_exceptions])
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++fi
++
++# See if the linker supports building shared libraries.
++AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++old_archive_from_expsyms_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_into_libs=no
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++link_all_deplibs=unknown
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++extract_expsyms_cmds=
++
++case $host_os in
++cygwin* | mingw* | pw32* )
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$GCC" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case $host_os in
++  aix3* | aix4* | aix5*)
++    # On AIX, the GNU linker is very broken
++    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
++      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
++      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
++      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
++      else $CC -o impgen impgen.c ; fi)~
++      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
++
++    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
++
++    # cygwin and mingw dlls have different entry points and sets of symbols
++    # to exclude.
++    # FIXME: what about values for MSVC?
++    dll_entry=__cygwin_dll_entry@12
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
++    case $host_os in
++    mingw*)
++      # mingw values
++      dll_entry=_DllMainCRTStartup@12
++      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++      ;;
++    esac
++
++    # mingw and cygwin differ, and it's simplest to just exclude the union
++    # of the two symbol sets.
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
++
++    # recent cygwin and mingw systems supply a stub DllMain which the user
++    # can override, but on older systems we have to supply one (in ltdll.c)
++    if test "x$lt_cv_need_dllmain" = "xyes"; then
++      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
++      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
++	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
++    else
++      ltdll_obj=
++      ltdll_cmds=
++    fi
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left be newer dlltools.
++    export_symbols_cmds="$ltdll_cmds"'
++      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
++      [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
++
++    # If the export-symbols file already is a .def file (1st line
++    # is EXPORTS), use it as is.
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++        cp $export_symbols $output_objdir/$soname-def;
++      else
++        echo EXPORTS > $output_objdir/$soname-def;
++        _lt_hint=1;
++        cat $export_symbols | while read symbol; do
++         set dummy \$symbol;
++         case \[$]# in
++           2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
++           *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
++         esac;
++         _lt_hint=`expr 1 + \$_lt_hint`;
++        done;
++      fi~
++      '"$ltdll_cmds"'
++      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
++      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
++      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++      wlarc=
++    else
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw* | pw32*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++	whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
++else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case $host_os in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$GCC" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
++
++  aix4* | aix5*)
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    archive_cmds=''
++    hardcode_libdir_separator=':'
++    if test "$GCC" = yes; then
++      collect2name=`${CC} -print-prog-name=collect2`
++      if test -f "$collect2name" && \
++	 strings "$collect2name" | grep resolve_lib_name >/dev/null
++      then
++	# We have reworked collect2
++	hardcode_direct=yes
++      else
++        # We have old collect2
++        hardcode_direct=unsupported
++        # It fails to find uninstalled libraries when the uninstalled
++        # path is not listed in the libpath.  Setting hardcode_minus_L
++        # to unsupported forces relinking
++        hardcode_minus_L=yes
++        hardcode_libdir_flag_spec='-L$libdir'
++        hardcode_libdir_separator=
++      fi
++      shared_flag='-shared'
++    else
++      if test "$host_cpu" = ia64; then
++        shared_flag='-G'
++      else
++        shared_flag='${wl}-bM:SRE'
++      fi
++      hardcode_direct=yes
++    fi
++
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      # Test if we are trying to use run time linking, or normal AIX style linking.
++      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
++      aix_use_runtimelinking=no
++      for ld_flag in $LDFLAGS; do
++        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
++          aix_use_runtimelinking=yes
++          break
++        fi
++      done
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++    # It seems that -bexpall can do strange things, so it is better to
++    # generate a list of symbols to export.
++    always_export_symbols=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++      allow_undefined_flag=' -Wl,-G'
++      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++    else
++      if test "$host_cpu" = ia64; then
++        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++       allow_undefined_flag="-znodefs"
++        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++        # Warning - without using the other run time loading flags, -berok will
++        #           link without error, but may produce a broken library.
++        allow_undefined_flag='${wl}-berok"
++        # This is a bit strange, but is similar to how AIX traditionally builds
++        # it's shared libraries.
++        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
++      fi
++    fi
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++    fix_srcfile_path='`cygpath -w "$srcfile"`'
++    ;;
++
++  darwin* | rhapsody*)
++    allow_undefined_flag='-undefined suppress'
++    # FIXME: Relying on posixy $() will cause problems for
++    #        cross-compilation, but unfortunately the echo tests do not
++    #        yet detect zsh echo's removal of \ escapes.
++    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case $host_os in
++    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6*)
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    link_all_deplibs=yes
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    fi
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  newsos6)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)	# as osf3* with the addition of -msym flag
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++      #Both c and cxx compiler support -rpath directly
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    ;;
++
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    ;;
++
++  solaris*)
++    no_undefined_flag=' -z defs'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case $host_os in
++    [solaris2.[0-5] | solaris2.[0-5].*]) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    link_all_deplibs=yes
++    ;;
++
++  sunos4*)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++    fi
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4)
++    if test "x$host_vendor" = xsno; then
++      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
++      hardcode_direct=yes # is this really true???
++    else
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  sysv5uw7* | unixware7*)
++    no_undefined_flag='${wl}-z ${wl}text'
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    ld_shlibs=no
++    ;;
++  esac
++fi
++AC_MSG_RESULT([$ld_shlibs])
++test "$ld_shlibs" = no && can_build_shared=no
++
++# Check hardcoding attributes.
++AC_MSG_CHECKING([how to hardcode library paths into programs])
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++AC_MSG_RESULT([$hardcode_action])
++
++striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++  AC_MSG_RESULT([no])
++fi
++
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++# PORTME Fill in your ld.so characteristics
++AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      [ aix4 | aix4.[01] | aix4.[01].*)]
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++           echo ' yes '
++           echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++        :
++      else
++        can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
++      # lib<name>.a to let people know that these are not typical AIX shared libraries.
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}.so$major'
++    fi
++    shlibpath_var=LIBPATH
++    deplibs_check_method=pass_all
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  case $GCC,$host_os in
++  yes,cygwin*)
++    library_names_spec='$libname.dll.a'
++    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
++    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog .libs/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    ;;
++  yes,mingw*)
++    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
++    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
++    ;;
++  yes,pw32*)
++    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    ;;
++  *)
++    library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  # FIXME: Relying on posixy $() will cause problems for
++  #        cross-compilation, but unfortunately the echo tests do not
++  #        yet detect zsh echo's removal of \ escapes.
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6*)
++  version_type=irix
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  case $host_os in
++  irix5*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++    need_version=no
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_version=no
++  soname_spec='${libname}${release}.so'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++AC_LIBTOOL_DLOPEN_SELF
++
++if test "$enable_shared" = yes && test "$GCC" = yes; then
++  case $archive_cmds in
++  *'~'*)
++    # FIXME: we may have to deal with multi-command sequences.
++    ;;
++  '$CC '*)
++    # Test whether the compiler implicitly links with -lc since on some
++    # systems, -lgcc has to come before -lc. If gcc already passes -lc
++    # to ld, don't add -lc before -lgcc.
++    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
++    [$rm conftest*
++    echo 'static int dummy;' > conftest.$ac_ext
++
++    if AC_TRY_EVAL(ac_compile); then
++      soname=conftest
++      lib=conftest
++      libobjs=conftest.$ac_objext
++      deplibs=
++      wl=$lt_cv_prog_cc_wl
++      compiler_flags=-v
++      linker_flags=-v
++      verstring=
++      output_objdir=.
++      libname=conftest
++      save_allow_undefined_flag=$allow_undefined_flag
++      allow_undefined_flag=
++      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++      then
++	lt_cv_archive_cmds_need_lc=no
++      else
++	lt_cv_archive_cmds_need_lc=yes
++      fi
++      allow_undefined_flag=$save_allow_undefined_flag
++    else
++      cat conftest.err 1>&5
++    fi])
++    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
++    ;;
++  esac
++fi
++need_lc=${lt_cv_archive_cmds_need_lc-yes}
++
++# The second clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  :
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  test -f Makefile && make "$ltmain"
++fi
++
++if test -f "$ltmain"; then
++  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
++  $rm -f "${ofile}T"
++
++  echo creating $ofile
++
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS \
++    AR AR_FLAGS CC LD LN_S NM SHELL \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
++    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
++    old_striplib striplib file_magic_cmd export_symbols_cmds \
++    deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case $var in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  cat <<__EOF__ > "${ofile}T"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="sed -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$need_lc
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# The default C compiler.
++CC=$lt_CC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_pic_flag
++pic_mode=$pic_mode
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$lt_compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
+ 
+-dnl
+-dnl Test for __attribute__
+-dnl
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
+ 
+-AC_DEFUN(AC_C___ATTRIBUTE__, [
+-AC_MSG_CHECKING(for __attribute__)
+-AC_CACHE_VAL(ac_cv___attribute__, [
+-AC_TRY_COMPILE([
+-#include <stdlib.h>
+-],
+-[
+-static void foo(void) __attribute__ ((noreturn));
++# Library versioning type.
++version_type=$version_type
+ 
+-static void
+-foo(void)
+-{
+-  exit(1);
+-}
+-],
+-ac_cv___attribute__=yes,
+-ac_cv___attribute__=no)])
+-if test "$ac_cv___attribute__" = "yes"; then
+-  AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__])
+-fi
+-AC_MSG_RESULT($ac_cv___attribute__)
+-])
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
+ 
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
+ 
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
+ 
+-# serial 44 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,[AC_REQUIRE([_AC_PROG_LIBTOOL])])
+-AC_DEFUN(_AC_PROG_LIBTOOL,
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+-# Save cache, so that ltconfig can load it
+-AC_CACHE_SAVE
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+ 
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+-|| AC_MSG_ERROR([libtool configure failed])
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+ 
+-# Reload cache, that may have been modified by ltconfig
+-AC_CACHE_LOAD
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-AC_SUBST(LIBTOOL)dnl
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
+ 
+-# Redirect the config.log output again, so that the ltconfig log is not
+-# clobbered by the next message.
+-exec 5>>./config.log
+-])
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
+ 
+-AC_DEFUN(AC_LIBTOOL_SETUP,
+-[AC_PREREQ(2.13)dnl
+-AC_REQUIRE([AC_ENABLE_SHARED])dnl
+-AC_REQUIRE([AC_ENABLE_STATIC])dnl
+-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_LD])dnl
+-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+-AC_REQUIRE([AC_PROG_NM])dnl
+-AC_REQUIRE([AC_PROG_LN_S])dnl
+-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+-AC_REQUIRE([AC_OBJEXT])dnl
+-AC_REQUIRE([AC_EXEEXT])dnl
+-dnl
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
+ 
+-# Only perform the check for file, if the check method requires it
+-case "$deplibs_check_method" in
+-file_magic*)
+-  if test "$file_magic_cmd" = '${MAGIC}'; then
+-    AC_PATH_MAGIC
+-  fi
+-  ;;
+-esac
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
+ 
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags="--cache-file=$cache_file"
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
+-[libtool_flags="$libtool_flags --enable-dlopen"])
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[libtool_flags="$libtool_flags --enable-win32-dll"])
+-AC_ARG_ENABLE(libtool-lock,
+-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
+ 
+-AC_ARG_WITH(pic,
+-  [  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+-     pic_mode="$withval", pic_mode=default)
+-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
+-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_global_symbol_pipe
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$host" in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_SAVE
+-     AC_LANG_C
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_RESTORE])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
+ 
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+ 
+-  # recent cygwin and mingw systems supply a stub DllMain which the user
+-  # can override, but on older systems we have to supply one
+-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
+-    [AC_TRY_LINK([],
+-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+-      DllMain (0, 0, 0);],
+-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-  case "$host/$CC" in
+-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+-    # old mingw systems require "-dll" to link a DLL, while more recent ones
+-    # require "-mdll"
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -mdll"
+-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
+-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
+-    CFLAGS="$SAVE_CFLAGS" ;;
+-  *-*-cygwin*)
+-    # cygwin systems need to pass --dll to the linker, and not link
+-    # crt.o which will require a WinMain@16 definition.
+-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "${ofile}T"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
+   esac
+-  ;;
+-  ])
+-esac
+-])
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | os2*)
++    cat <<'EOF' >> "${ofile}T"
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++        # This is a source program that is used to create import libraries
++        # on Windows for dlls which lack them. Don't remove nor modify the
++        # starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
++#
++#  This file is part of GNU libtool.
++#
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++#
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++#
++# #include <stdio.h>		/* for printf() */
++# #include <unistd.h>		/* for open(), lseek(), read() */
++# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++# #include <string.h>		/* for strdup() */
++#
++# /* O_BINARY isn't required (or even defined sometimes) under Unix */
++# #ifndef O_BINARY
++# #define O_BINARY 0
++# #endif
++#
++# static unsigned int
++# pe_get16 (fd, offset)
++#      int fd;
++#      int offset;
++# {
++#   unsigned char b[2];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 2);
++#   return b[0] + (b[1]<<8);
++# }
++#
++# static unsigned int
++# pe_get32 (fd, offset)
++#     int fd;
++#     int offset;
++# {
++#   unsigned char b[4];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 4);
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# static unsigned int
++# pe_as32 (ptr)
++#      void *ptr;
++# {
++#   unsigned char *b = ptr;
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# int
++# main (argc, argv)
++#     int argc;
++#     char *argv[];
++# {
++#     int dll;
++#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#     unsigned long export_rva, export_size, nsections, secptr, expptr;
++#     unsigned long name_rvas, nexp;
++#     unsigned char *expdata, *erva;
++#     char *filename, *dll_name;
++#
++#     filename = argv[1];
++#
++#     dll = open(filename, O_RDONLY|O_BINARY);
++#     if (dll < 1)
++# 	return 1;
++#
++#     dll_name = filename;
++#
++#     for (i=0; filename[i]; i++)
++# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++# 	    dll_name = filename + i +1;
++#
++#     pe_header_offset = pe_get32 (dll, 0x3c);
++#     opthdr_ofs = pe_header_offset + 4 + 20;
++#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
++#
++#     if (num_entries < 1) /* no exports */
++# 	return 1;
++#
++#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#     export_size = pe_get32 (dll, opthdr_ofs + 100);
++#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#     secptr = (pe_header_offset + 4 + 20 +
++# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
++#
++#     expptr = 0;
++#     for (i = 0; i < nsections; i++)
++#     {
++# 	char sname[8];
++# 	unsigned long secptr1 = secptr + 40 * i;
++# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++# 	lseek(dll, secptr1, SEEK_SET);
++# 	read(dll, sname, 8);
++# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++# 	{
++# 	    expptr = fptr + (export_rva - vaddr);
++# 	    if (export_rva + export_size > vaddr + vsize)
++# 		export_size = vsize - (export_rva - vaddr);
++# 	    break;
++# 	}
++#     }
++#
++#     expdata = (unsigned char*)malloc(export_size);
++#     lseek (dll, expptr, SEEK_SET);
++#     read (dll, expdata, export_size);
++#     erva = expdata - export_rva;
++#
++#     nexp = pe_as32 (expdata+24);
++#     name_rvas = pe_as32 (expdata+32);
++#
++#     printf ("EXPORTS\n");
++#     for (i = 0; i<nexp; i++)
++#     {
++# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#     }
++#
++#     return 0;
++# }
++# /* impgen.c ends here */
++
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
++  mv -f "${ofile}T" "$ofile" || \
++    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  chmod +x "$ofile"
++fi
++
++])# _LT_AC_LTCONFIG_HACK
+ 
+ # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+-AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
++AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
+ 
+ # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+-AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+ 
+ # AC_ENABLE_SHARED - implement the --enable-shared flag
+ # Usage: AC_ENABLE_SHARED[(DEFAULT)]
+ #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+ #   `yes'.
+-AC_DEFUN(AC_ENABLE_SHARED, [dnl
+-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE(shared,
+ changequote(<<, >>)dnl
+ <<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+ changequote([, ])dnl
+ [p=${PACKAGE-default}
+-case "$enableval" in
++case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+@@ -717,21 +3317,22 @@
+ ])
+ 
+ # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+-AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)])
+ 
+ # AC_ENABLE_STATIC - implement the --enable-static flag
+ # Usage: AC_ENABLE_STATIC[(DEFAULT)]
+ #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+ #   `yes'.
+-AC_DEFUN(AC_ENABLE_STATIC, [dnl
+-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE(static,
+ changequote(<<, >>)dnl
+ <<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+ changequote([, ])dnl
+ [p=${PACKAGE-default}
+-case "$enableval" in
++case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+@@ -750,7 +3351,8 @@
+ ])
+ 
+ # AC_DISABLE_STATIC - set the default static flag to --disable-static
+-AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_STATIC(no)])
+ 
+ 
+@@ -758,14 +3360,14 @@
+ # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+ #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+ #   `yes'.
+-AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
+-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+ AC_ARG_ENABLE(fast-install,
+ changequote(<<, >>)dnl
+ <<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+ changequote([, ])dnl
+ [p=${PACKAGE-default}
+-case "$enableval" in
++case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+@@ -784,30 +3386,32 @@
+ ])
+ 
+ # AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
+-AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_FAST_INSTALL(no)])
+ 
+ # AC_LIBTOOL_PICMODE - implement the --with-pic flag
+ # Usage: AC_LIBTOOL_PICMODE[(MODE)]
+ #   Where MODE is either `yes' or `no'.  If omitted, it defaults to
+ #   `both'.
+-AC_DEFUN(AC_LIBTOOL_PICMODE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ pic_mode=ifelse($#,1,$1,default)])
+ 
+ 
+ # AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+-AC_DEFUN(AC_PATH_TOOL_PREFIX,
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC,
+-[case "$MAGIC" in
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
+   /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
+   ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+   ;;
+   *)
+-  ac_save_MAGIC="$MAGIC"
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
+   IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+ dnl $ac_dummy forces splitting on constant user-supplied paths.
+ dnl POSIX.2 word splitting is done only on the output of word expansions,
+@@ -816,12 +3420,12 @@
+   for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC="$ac_dir/$1"
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+       if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
++	case $deplibs_check_method in
+ 	"file_magic "*)
+ 	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	    egrep "$file_magic_regex" > /dev/null; then
+ 	    :
+@@ -845,12 +3449,12 @@
+     fi
+   done
+   IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
+   ;;
+ esac])
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  AC_MSG_RESULT($MAGIC)
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
+ else
+   AC_MSG_RESULT(no)
+ fi
+@@ -858,21 +3462,21 @@
+ 
+ 
+ # AC_PATH_MAGIC - find a file program which can recognise a shared library
+-AC_DEFUN(AC_PATH_MAGIC,
++AC_DEFUN([AC_PATH_MAGIC],
+ [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+ AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+-if test -z "$lt_cv_path_MAGIC"; then
++if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+     AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
+   else
+-    MAGIC=:
++    MAGIC_CMD=:
+   fi
+ fi
+ ])
+ 
+ 
+ # AC_PROG_LD - find the path to the GNU or non-GNU linker
+-AC_DEFUN(AC_PROG_LD,
++AC_DEFUN([AC_PROG_LD],
+ [AC_ARG_WITH(gnu-ld,
+ [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+ test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+@@ -880,7 +3484,7 @@
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ ac_prog=ld
+-if test "$ac_cv_prog_gcc" = yes; then
++if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+   AC_MSG_CHECKING([for ld used by GCC])
+   case $host in
+@@ -890,12 +3494,10 @@
+   *)
+     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+   esac
+-  case "$ac_prog" in
++  case $ac_prog in
+     # Accept absolute paths.
+-changequote(,)dnl
+-    [\\/]* | [A-Za-z]:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-changequote([,])dnl
++    [[\\/]* | [A-Za-z]:[\\/]*)]
++      [re_direlt='/[^/][^/]*/\.\./']
+       # Canonicalize the path of ld
+       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+@@ -917,17 +3519,17 @@
+ else
+   AC_MSG_CHECKING([for non-GNU ld])
+ fi
+-AC_CACHE_VAL(ac_cv_path_LD,
++AC_CACHE_VAL(lt_cv_path_LD,
+ [if test -z "$LD"; then
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      ac_cv_path_LD="$ac_dir/$ac_prog"
++      lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+       # but apparently some GNU ld's only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+ 	test "$with_gnu_ld" != no && break
+       else
+ 	test "$with_gnu_ld" != yes && break
+@@ -936,9 +3538,9 @@
+   done
+   IFS="$ac_save_ifs"
+ else
+-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi])
+-LD="$ac_cv_path_LD"
++LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+   AC_MSG_RESULT($LD)
+ else
+@@ -948,20 +3550,21 @@
+ AC_PROG_LD_GNU
+ ])
+ 
+-AC_DEFUN(AC_PROG_LD_GNU,
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
++# AC_PROG_LD_GNU -
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+ [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+ if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  ac_cv_prog_gnu_ld=yes
++  lt_cv_prog_gnu_ld=yes
+ else
+-  ac_cv_prog_gnu_ld=no
++  lt_cv_prog_gnu_ld=no
+ fi])
+-with_gnu_ld=$ac_cv_prog_gnu_ld
++with_gnu_ld=$lt_cv_prog_gnu_ld
+ ])
+ 
+ # AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+ #   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN(AC_PROG_LD_RELOAD_FLAG,
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+ [AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
+ [lt_cv_ld_reload_flag='-r'])
+ reload_flag=$lt_cv_ld_reload_flag
+@@ -970,10 +3573,10 @@
+ 
+ # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
+ #  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN(AC_DEPLIBS_CHECK_METHOD,
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+ [AC_CACHE_CHECK([how to recognise dependant libraries],
+ lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='${MAGIC}'
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+ lt_cv_deplibs_check_method='unknown'
+ # Need to set the preceding variable on all platforms that support
+@@ -982,13 +3585,13 @@
+ # `unknown' -- same as none, but documents that we really don't know.
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+-# 'file_magic [regex]' -- check by looking for files in library path
++# ['file_magic [regex]'] -- check by looking for files in library path
+ # which responds to the $file_magic_cmd with a given egrep regex.
+ # If you have `file' or equivalent on your system and you're not sure
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+-case "$host_os" in
+-aix4*)
++case $host_os in
++aix4* | aix5*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -997,25 +3600,36 @@
+   ;;
+ 
+ bsdi4*)
+-  changequote(,)dnl
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-  changequote([, ])dnl
++  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin* | mingw*)
++cygwin* | mingw* | pw32*)
+   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[012])
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    ;;
++  *) # Darwin 1.3 on
++    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
+   ;;
+ 
+ freebsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case "$host_cpu" in
++    case $host_cpu in
+     i*86 )
+-      changequote(,)dnl
+-      lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
+-      changequote([, ])dnl
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -1029,30 +3643,27 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-hpux10.20*)
+-  # TODO:  Does this work for hpux-11 too?
+-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++hpux10.20*|hpux11*)
++  [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
+   lt_cv_file_magic_cmd=/usr/bin/file
+   lt_cv_file_magic_test_file=/usr/lib/libc.sl
+   ;;
+ 
+ irix5* | irix6*)
+-  case "$host_os" in
++  case $host_os in
+   irix5*)
+     # this will be overridden with pass_all, but let us keep it just in case
+     lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+     ;;
+   *)
+-    case "$LD" in
++    case $LD in
+     *-32|*"-32 ") libmagic=32-bit;;
+     *-n32|*"-n32 ") libmagic=N32;;
+     *-64|*"-64 ") libmagic=64-bit;;
+     *) libmagic=never-match;;
+     esac
+     # this will be overridden with pass_all, but let us keep it just in case
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-    changequote([, ])dnl
++    [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
+     ;;
+   esac
+   lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+@@ -1061,29 +3672,30 @@
+ 
+ # This must be Linux ELF.
+ linux-gnu*)
+-  case "$host_cpu" in
++  case $host_cpu in
+   alpha* | i*86 | powerpc* | sparc* | ia64* )
+     lt_cv_deplibs_check_method=pass_all ;;
+   *)
+     # glibc up to 2.1.1 does not perform some relocations on ARM
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-    changequote([, ])dnl
++    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
+   esac
+   lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+ netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
+   else
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-    changequote([, ])dnl
+-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
+   fi
+   ;;
+ 
++newos6*)
++  [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
+ osf3* | osf4* | osf5*)
+   # this will be overridden with pass_all, but let us keep it just in case
+   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+@@ -1100,16 +3712,27 @@
+   lt_cv_file_magic_test_file=/lib/libc.so
+   ;;
+ 
++[sysv5uw[78]* | sysv4*uw2*)]
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case "$host_vendor" in
++  case $host_vendor in
++  motorola)
++    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
+   ncr)
+     lt_cv_deplibs_check_method=pass_all
+     ;;
+-  motorola)
+-    changequote(,)dnl
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-    changequote([, ])dnl
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
++    lt_cv_file_magic_test_file=/lib/libc.so
+     ;;
+   esac
+   ;;
+@@ -1121,12 +3744,12 @@
+ 
+ 
+ # AC_PROG_NM - find the path to a BSD-compatible name lister
+-AC_DEFUN(AC_PROG_NM,
++AC_DEFUN([AC_PROG_NM],
+ [AC_MSG_CHECKING([for BSD-compatible nm])
+-AC_CACHE_VAL(ac_cv_path_NM,
++AC_CACHE_VAL(lt_cv_path_NM,
+ [if test -n "$NM"; then
+   # Let the user override the test.
+-  ac_cv_path_NM="$NM"
++  lt_cv_path_NM="$NM"
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+@@ -1136,31 +3759,32 @@
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -B"
++      # Tru64's nm complains that /dev/null is an invalid object file
++      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -B"
+ 	break
+       elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -p"
++	lt_cv_path_NM="$tmp_nm -p"
+ 	break
+       else
+-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
++	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ 	continue # so that we can try to find one that supports BSD flags
+       fi
+     fi
+   done
+   IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+-NM="$ac_cv_path_NM"
++NM="$lt_cv_path_NM"
+ AC_MSG_RESULT([$NM])
+ ])
+ 
+ # AC_CHECK_LIBM - check for math library
+-AC_DEFUN(AC_CHECK_LIBM,
++AC_DEFUN([AC_CHECK_LIBM],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+-case "$host" in
+-*-*-beos* | *-*-cygwin*)
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32*)
+   # These system don't have libm
+   ;;
+ *-ncr-sysv4.3*)
+@@ -1183,8 +3807,9 @@
+ # '${top_srcdir}/' (note the single quotes!).  If your package is not
+ # flat and you're not using automake, define top_builddir and
+ # top_srcdir appropriately in the Makefiles.
+-AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case "$enable_ltdl_convenience" in
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
+   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+   "") enable_ltdl_convenience=yes
+       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+@@ -1204,7 +3829,8 @@
+ # not flat and you're not using automake, define top_builddir and
+ # top_srcdir appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+   AC_CHECK_LIB(ltdl, main,
+   [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+   [if test x"$enable_ltdl_install" = xno; then
+@@ -1224,17 +3850,17 @@
+   fi
+ ])
+ 
+-dnl old names
+-AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+-AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+-AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+-AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+-AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+-AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+-AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+-dnl This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])dnl
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+ dnl $Id: wflags.m4,v 1.3 1999/03/11 12:11:41 joda Exp $
+ dnl
+@@ -1951,12 +4577,13 @@
+ dnl moved to AC_OUTPUT in configure.in
+ dnl AC_CONFIG_FILES($1/Makefile)
+ 
+-LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
++dnl LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+ 
+ AC_SUBST(DIR_roken)dnl
+ AC_SUBST(LIB_roken)dnl
+ AC_SUBST(INCLUDES_roken)dnl
+ ])
++
+ dnl $Id: check-type-extra.m4,v 1.2 1999/03/01 09:52:23 joda Exp $
+ dnl
+ dnl ac_check_type + extra headers
+@@ -2066,7 +4693,7 @@
+ 
+ # Define a conditional.
+ 
+-AC_DEFUN(AM_CONDITIONAL,
++AC_DEFUN([AM_CONDITIONAL],
+ [AC_SUBST($1_TRUE)
+ AC_SUBST($1_FALSE)
+ if $2; then
+@@ -2486,49 +5113,6 @@
+ #endif])
+ ])
+ 
+-dnl $Id: krb-func-getcwd-broken.m4,v 1.2 1999/03/01 13:03:32 joda Exp $
+-dnl
+-dnl
+-dnl test for broken getcwd in (SunOS braindamage)
+-dnl
+-
+-AC_DEFUN(AC_KRB_FUNC_GETCWD_BROKEN, [
+-if test "$ac_cv_func_getcwd" = yes; then
+-AC_MSG_CHECKING(if getcwd is broken)
+-AC_CACHE_VAL(ac_cv_func_getcwd_broken, [
+-ac_cv_func_getcwd_broken=no
+-
+-AC_TRY_RUN([
+-#include <errno.h>
+-char *getcwd(char*, int);
+-
+-void *popen(char *cmd, char *mode)
+-{
+-	errno = ENOTTY;
+-	return 0;
+-}
+-
+-int main()
+-{
+-	char *ret;
+-	ret = getcwd(0, 1024);
+-	if(ret == 0 && errno == ENOTTY)
+-		return 0;
+-	return 1;
+-}
+-], ac_cv_func_getcwd_broken=yes,:,:)
+-])
+-if test "$ac_cv_func_getcwd_broken" = yes; then
+-	AC_DEFINE(BROKEN_GETCWD, 1, [Define if getcwd is broken (like in SunOS 4).])dnl
+-	LIBOBJS="$LIBOBJS getcwd.o"
+-	AC_SUBST(LIBOBJS)dnl
+-	AC_MSG_RESULT($ac_cv_func_getcwd_broken)
+-else
+-	AC_MSG_RESULT([seems ok])
+-fi
+-fi
+-])
+-
+ dnl $Id: proto-compat.m4,v 1.3 1999/03/01 13:03:48 joda Exp $
+ dnl
+ dnl
+@@ -2654,7 +5238,7 @@
+ dnl
+ dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
+ 
+-AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
++AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
+ 
+ AC_DEFUN(AC_TEST_PACKAGE_NEW,[
+ AC_ARG_WITH($1,
+@@ -2691,7 +5275,7 @@
+ header_dirs=
+ lib_dirs=
+ d='$5'
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -2724,6 +5308,7 @@
+ if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+ 	$1_includedir="$ires"
+ 	$1_libdir="$lres"
++	DIR_$1=
+ 	INCLUDE_$1="-I$$1_includedir"
+ 	LIB_$1="-L$$1_libdir $3"
+ 	m4_ifval([$6],
+@@ -2732,6 +5317,7 @@
+ 	with_$1=yes
+ 	AC_MSG_RESULT([headers $ires, libraries $lres])
+ else
++	DIR_$1="$1"
+ 	INCLUDE_$1=
+ 	LIB_$1=
+ 	with_$1=no
+@@ -2740,6 +5326,7 @@
+ dnl m4_ifval([$6],
+ dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
+ dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
++AC_SUBST(DIR_$1)
+ AC_SUBST(INCLUDE_$1)
+ AC_SUBST(LIB_$1)
+ ])
+@@ -3143,19 +5730,96 @@
+ 	:
+ elif test "$ac_cv_func_el_init" = yes; then
+ 	ac_foo=yes
++	DIR_readline="editline"
+ 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init"
+ else
++	DIR_readline="editline"
+ 	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
+ fi
+ AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
+-if test "$readline_libdir"; then
+-	LIB_readline="-rpath $readline_libdir $LIB_readline"
+-fi
++#if test "$readline_libdir"; then
++#	LIB_readline="-rpath $readline_libdir $LIB_readline"
++#fi
+ LIB_readline="$LIB_readline \$(LIB_tgetent)"
+ AC_DEFINE(HAVE_READLINE, 1, 
+ 	[Define if you have a readline compatible library.])dnl
+ 
+ ])
++
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_COM_ERR,[
++dnl com_err
++
++ac_foo=no
++if test "$with_com_err" = yes; then
++	COMPILE_ET='compile_et'
++#elif test "$ac_cv_func_com_err" = yes; then
++#	COMPILE_ET='compile_et'
++else
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++if true; then
++#	!FIXME! why doesn't built in version of com_err work?
++	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
++	DIR_com_err="com_err"
++	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
++fi
++
++#if test "$com_err_libdir"; then
++#	LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
++#fi
++AC_DEFINE(HAVE_COM_ERR, 1, 
++	[Define if you have a com_err compatible library.])dnl
++
++])
++AC_SUBST(COMPILE_ET)
++
++dnl
++dnl Tests for readline functions
++dnl
++
++dnl el_init
++
++AC_DEFUN(KRB_SS,[
++dnl com_err
++
++ac_foo=no
++if test "$with_ss" = yes; then
++	LIB_sl="$LIB_ss"
++else
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/sl'
++fi
++
++
++#if test "$ss_libdir"; then
++#	LIB_ss="-rpath $sl_libdir $LIB_ss"
++#fi
++
++if true; then
++#	!FIXME! why doesn't built in version of ss work?
++	DIR_ss="sl"
++	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
++	LIB_ss='$(top_builddir)/lib/sl/libss.la'
++	INCLUDE_ss='-I$(top_builddir)/include/ss'
++fi
++
++AC_DEFINE(HAVE_SS, 1, 
++	[Define if you have a ss compatible library.])dnl
++
++])
++AC_SUBST(LIB_sl)
++
+ dnl $Id: auth-modules.m4,v 1.1 1999/03/21 13:48:00 joda Exp $
+ dnl
+ dnl Figure what authentication modules should be built
+diff -ruN heimdal-0.3e-old/admin/Makefile.in heimdal-0.3e/admin/Makefile.in
+--- heimdal-0.3e-old/admin/Makefile.in	Mon Feb  5 18:58:53 2001
++++ heimdal-0.3e/admin/Makefile.in	Sat Jun 16 15:14:48 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -126,13 +131,13 @@
+ 
+ SUFFIXES = .et .h .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .x
+ 
+-INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline)
++INCLUDES = -I$(top_builddir)/include $(INCLUDES_roken) $(INCLUDE_readline) $(INCLUDE_ss)
+ 
+ AM_CFLAGS =  $(WFLAGS)
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -206,7 +217,7 @@
+ 	$(top_builddir)/lib/krb5/libkrb5.la \
+ 	$(LIB_des) \
+ 	$(top_builddir)/lib/asn1/libasn1.la \
+-	$(top_builddir)/lib/sl/libsl.la \
++	$(LIB_ss) \
+ 	$(LIB_readline) \
+ 	$(LIB_roken)
+ 
+@@ -231,8 +242,7 @@
+ ktutil_OBJECTS =  $(am_ktutil_OBJECTS)
+ ktutil_LDADD = $(LDADD)
+ ktutil_DEPENDENCIES =  $(top_builddir)/lib/kadm5/libkadm5clnt.la \
+-$(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/asn1/libasn1.la \
+-$(top_builddir)/lib/sl/libsl.la
++$(top_builddir)/lib/krb5/libkrb5.la $(top_builddir)/lib/asn1/libasn1.la
+ ktutil_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/Makefile.in heimdal-0.3e/appl/Makefile.in
+--- heimdal-0.3e-old/appl/Makefile.in	Mon Feb  5 18:58:57 2001
++++ heimdal-0.3e/appl/Makefile.in	Sat Jun 16 15:14:48 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -269,10 +280,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3e-old/appl/afsutil/Makefile.in heimdal-0.3e/appl/afsutil/Makefile.in
+--- heimdal-0.3e-old/appl/afsutil/Makefile.in	Mon Feb  5 18:58:59 2001
++++ heimdal-0.3e/appl/afsutil/Makefile.in	Sat Jun 16 15:14:48 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/dceutils/Makefile.in heimdal-0.3e/appl/dceutils/Makefile.in
+--- heimdal-0.3e-old/appl/dceutils/Makefile.in	Mon Feb  5 18:59:33 2001
++++ heimdal-0.3e/appl/dceutils/Makefile.in	Sat Jun 16 15:14:51 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -235,8 +246,7 @@
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES =  $(dpagaix_SOURCES) $(k5dcecon_SOURCES)
+ depcomp = 
+-DIST_COMMON =  ChangeLog Makefile.am Makefile.in appl/dceutils/compile \
+-compile
++DIST_COMMON =  ChangeLog Makefile.am Makefile.in compile
+ 
+ 
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -357,7 +367,6 @@
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+ 
+ distdir: $(DISTFILES)
+-	$(mkinstalldirs) $(distdir)/appl/dceutils
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+diff -ruN heimdal-0.3e-old/appl/ftp/Makefile.in heimdal-0.3e/appl/ftp/Makefile.in
+--- heimdal-0.3e-old/appl/ftp/Makefile.in	Mon Feb  5 18:59:00 2001
++++ heimdal-0.3e/appl/ftp/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -249,10 +260,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3e-old/appl/ftp/common/Makefile.in heimdal-0.3e/appl/ftp/common/Makefile.in
+--- heimdal-0.3e-old/appl/ftp/common/Makefile.in	Mon Feb  5 18:59:03 2001
++++ heimdal-0.3e/appl/ftp/common/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/ftp/ftp/Makefile.in heimdal-0.3e/appl/ftp/ftp/Makefile.in
+--- heimdal-0.3e-old/appl/ftp/ftp/Makefile.in	Mon Feb  5 18:59:04 2001
++++ heimdal-0.3e/appl/ftp/ftp/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = 
+@@ -261,8 +272,7 @@
+ @KRB5_FALSE@ftp_DEPENDENCIES =  ../common/libcommon.a
+ @KRB5_TRUE@ftp_DEPENDENCIES =  ../common/libcommon.a \
+ @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la \
+-@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ ftp_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/ftp/ftpd/Makefile.in heimdal-0.3e/appl/ftp/ftpd/Makefile.in
+--- heimdal-0.3e-old/appl/ftp/ftpd/Makefile.in	Mon Feb  5 18:59:06 2001
++++ heimdal-0.3e/appl/ftp/ftpd/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = 
+@@ -257,15 +268,13 @@
+ @KRB4_FALSE@@KRB5_FALSE@ftpd_DEPENDENCIES =  ../common/libcommon.a
+ @KRB4_FALSE@@KRB5_TRUE@ftpd_DEPENDENCIES =  ../common/libcommon.a \
+ @KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB4_TRUE@@KRB5_FALSE@ftpd_DEPENDENCIES =  ../common/libcommon.a \
+ @KRB4_TRUE@@KRB5_FALSE@$(top_builddir)/lib/kafs/libkafs.la
+ @KRB4_TRUE@@KRB5_TRUE@ftpd_DEPENDENCIES =  ../common/libcommon.a \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/kafs/libkafs.la \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ ftpd_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/kf/Makefile.in heimdal-0.3e/appl/kf/Makefile.in
+--- heimdal-0.3e-old/appl/kf/Makefile.in	Mon Feb  5 18:59:32 2001
++++ heimdal-0.3e/appl/kf/Makefile.in	Sat Jun 16 15:14:51 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/kx/Makefile.in heimdal-0.3e/appl/kx/Makefile.in
+--- heimdal-0.3e-old/appl/kx/Makefile.in	Mon Feb  5 18:59:08 2001
++++ heimdal-0.3e/appl/kx/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -131,7 +136,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,14 +179,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -260,14 +271,12 @@
+ kx_LDADD = $(LDADD)
+ @KRB4_FALSE@@KRB5_FALSE@kx_DEPENDENCIES = 
+ @KRB4_FALSE@@KRB5_TRUE@kx_DEPENDENCIES =  \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB4_TRUE@@KRB5_FALSE@kx_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_FALSE@$(top_builddir)/lib/kafs/libkafs.la
+ @KRB4_TRUE@@KRB5_TRUE@kx_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/kafs/libkafs.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ kx_LDFLAGS = 
+ @NEED_WRITEAUTH_FALSE@am_kxd_OBJECTS =  kxd.$(OBJEXT) common.$(OBJEXT) \
+ @NEED_WRITEAUTH_FALSE@context.$(OBJEXT) krb4.$(OBJEXT) krb5.$(OBJEXT)
+@@ -278,14 +287,12 @@
+ kxd_LDADD = $(LDADD)
+ @KRB4_FALSE@@KRB5_FALSE@kxd_DEPENDENCIES = 
+ @KRB4_FALSE@@KRB5_TRUE@kxd_DEPENDENCIES =  \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB4_TRUE@@KRB5_FALSE@kxd_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_FALSE@$(top_builddir)/lib/kafs/libkafs.la
+ @KRB4_TRUE@@KRB5_TRUE@kxd_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/kafs/libkafs.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ kxd_LDFLAGS = 
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
+diff -ruN heimdal-0.3e-old/appl/login/Makefile.in heimdal-0.3e/appl/login/Makefile.in
+--- heimdal-0.3e-old/appl/login/Makefile.in	Mon Feb  5 18:59:10 2001
++++ heimdal-0.3e/appl/login/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/otp/Makefile.in heimdal-0.3e/appl/otp/Makefile.in
+--- heimdal-0.3e-old/appl/otp/Makefile.in	Mon Feb  5 18:59:13 2001
++++ heimdal-0.3e/appl/otp/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/popper/Makefile.in heimdal-0.3e/appl/popper/Makefile.in
+--- heimdal-0.3e-old/appl/popper/Makefile.in	Mon Feb  5 18:59:14 2001
++++ heimdal-0.3e/appl/popper/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -233,8 +244,7 @@
+ pop_debug_OBJECTS =  pop_debug.$(OBJEXT)
+ pop_debug_LDADD = $(LDADD)
+ @KRB5_FALSE@pop_debug_DEPENDENCIES = 
+-@KRB5_TRUE@pop_debug_DEPENDENCIES =  $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@pop_debug_DEPENDENCIES =  $(top_builddir)/lib/krb5/libkrb5.la
+ pop_debug_LDFLAGS = 
+ am_popper_OBJECTS =  pop_dele.$(OBJEXT) pop_dropcopy.$(OBJEXT) \
+ pop_dropinfo.$(OBJEXT) pop_get_command.$(OBJEXT) pop_init.$(OBJEXT) \
+@@ -247,8 +257,7 @@
+ popper_OBJECTS =  $(am_popper_OBJECTS)
+ popper_LDADD = $(LDADD)
+ @KRB5_FALSE@popper_DEPENDENCIES = 
+-@KRB5_TRUE@popper_DEPENDENCIES =  $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@popper_DEPENDENCIES =  $(top_builddir)/lib/krb5/libkrb5.la
+ popper_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/push/Makefile.in heimdal-0.3e/appl/push/Makefile.in
+--- heimdal-0.3e-old/appl/push/Makefile.in	Mon Feb  5 18:59:18 2001
++++ heimdal-0.3e/appl/push/Makefile.in	Sat Jun 16 15:14:49 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -224,8 +235,7 @@
+ push_OBJECTS =  $(am_push_OBJECTS)
+ push_LDADD = $(LDADD)
+ @KRB5_FALSE@push_DEPENDENCIES = 
+-@KRB5_TRUE@push_DEPENDENCIES =  $(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@push_DEPENDENCIES =  $(top_builddir)/lib/krb5/libkrb5.la
+ push_LDFLAGS = 
+ SCRIPTS =  $(bin_SCRIPTS)
+ 
+diff -ruN heimdal-0.3e-old/appl/rcp/Makefile.in heimdal-0.3e/appl/rcp/Makefile.in
+--- heimdal-0.3e-old/appl/rcp/Makefile.in	Mon Feb  5 18:59:21 2001
++++ heimdal-0.3e/appl/rcp/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/rsh/Makefile.in heimdal-0.3e/appl/rsh/Makefile.in
+--- heimdal-0.3e-old/appl/rsh/Makefile.in	Mon Feb  5 18:59:19 2001
++++ heimdal-0.3e/appl/rsh/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -222,28 +233,24 @@
+ rsh_LDADD = $(LDADD)
+ @KRB4_FALSE@@KRB5_FALSE@rsh_DEPENDENCIES = 
+ @KRB4_FALSE@@KRB5_TRUE@rsh_DEPENDENCIES =  \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB4_TRUE@@KRB5_FALSE@rsh_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_FALSE@$(top_builddir)/lib/kafs/libkafs.la
+ @KRB4_TRUE@@KRB5_TRUE@rsh_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/kafs/libkafs.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ rsh_LDFLAGS = 
+ am_rshd_OBJECTS =  rshd.$(OBJEXT) common.$(OBJEXT)
+ rshd_OBJECTS =  $(am_rshd_OBJECTS)
+ rshd_LDADD = $(LDADD)
+ @KRB4_FALSE@@KRB5_FALSE@rshd_DEPENDENCIES = 
+ @KRB4_FALSE@@KRB5_TRUE@rshd_DEPENDENCIES =  \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB4_TRUE@@KRB5_FALSE@rshd_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_FALSE@$(top_builddir)/lib/kafs/libkafs.la
+ @KRB4_TRUE@@KRB5_TRUE@rshd_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/kafs/libkafs.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ rshd_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/su/Makefile.in heimdal-0.3e/appl/su/Makefile.in
+--- heimdal-0.3e-old/appl/su/Makefile.in	Mon Feb  5 18:59:22 2001
++++ heimdal-0.3e/appl/su/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/telnet/Makefile.in heimdal-0.3e/appl/telnet/Makefile.in
+--- heimdal-0.3e-old/appl/telnet/Makefile.in	Mon Feb  5 18:59:25 2001
++++ heimdal-0.3e/appl/telnet/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -251,10 +262,11 @@
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  if test "$$subdir" = "."; then dot_seen=yes; else :; fi; \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+diff -ruN heimdal-0.3e-old/appl/telnet/libtelnet/Makefile.in heimdal-0.3e/appl/telnet/libtelnet/Makefile.in
+--- heimdal-0.3e-old/appl/telnet/libtelnet/Makefile.in	Mon Feb  5 18:59:26 2001
++++ heimdal-0.3e/appl/telnet/libtelnet/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/telnet/telnet/Makefile.in heimdal-0.3e/appl/telnet/telnet/Makefile.in
+--- heimdal-0.3e-old/appl/telnet/telnet/Makefile.in	Mon Feb  5 18:59:27 2001
++++ heimdal-0.3e/appl/telnet/telnet/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = 
+@@ -225,8 +236,7 @@
+ telnet_LDADD = $(LDADD)
+ @KRB5_FALSE@telnet_DEPENDENCIES =  ../libtelnet/libtelnet.a
+ @KRB5_TRUE@telnet_DEPENDENCIES =  ../libtelnet/libtelnet.a \
+-@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ telnet_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/telnet/telnetd/Makefile.in heimdal-0.3e/appl/telnet/telnetd/Makefile.in
+--- heimdal-0.3e-old/appl/telnet/telnetd/Makefile.in	Mon Feb  5 18:59:29 2001
++++ heimdal-0.3e/appl/telnet/telnetd/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = 
+@@ -226,8 +237,7 @@
+ telnetd_LDADD = $(LDADD)
+ @KRB5_FALSE@telnetd_DEPENDENCIES =  ../libtelnet/libtelnet.a
+ @KRB5_TRUE@telnetd_DEPENDENCIES =  ../libtelnet/libtelnet.a \
+-@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ telnetd_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/appl/test/Makefile.in heimdal-0.3e/appl/test/Makefile.in
+--- heimdal-0.3e-old/appl/test/Makefile.in	Mon Feb  5 18:59:30 2001
++++ heimdal-0.3e/appl/test/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -132,7 +137,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -175,14 +180,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+diff -ruN heimdal-0.3e-old/appl/xnlock/Makefile.in heimdal-0.3e/appl/xnlock/Makefile.in
+--- heimdal-0.3e-old/appl/xnlock/Makefile.in	Mon Feb  5 18:59:24 2001
++++ heimdal-0.3e/appl/xnlock/Makefile.in	Sat Jun 16 15:14:50 2001
+@@ -1,6 +1,7 @@
+ # Makefile.in generated automatically by automake 1.4a from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-9, 2000 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 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.
+@@ -68,14 +69,17 @@
+ CATMAN = @CATMAN@
+ CATMANEXT = @CATMANEXT@
+ CC = @CC@
++COMPILE_ET = @COMPILE_ET@
+ CPP = @CPP@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ DBLIB = @DBLIB@
+ DEPDIR = @DEPDIR@
++DIR_ = @DIR_@
+ DIR_des = @DIR_des@
+ DIR_roken = @DIR_roken@
+ DLLTOOL = @DLLTOOL@
++ECHO = @ECHO@
+ EXEEXT = @EXEEXT@
+ EXTRA_LIB45 = @EXTRA_LIB45@
+ GROFF = @GROFF@
+@@ -92,6 +96,7 @@
+ LIB_otp = @LIB_otp@
+ LIB_roken = @LIB_roken@
+ LIB_security = @LIB_security@
++LIB_sl = @LIB_sl@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+@@ -131,7 +136,7 @@
+ 
+ CP = cp
+ 
+-COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
++COMPILE_ET = @COMPILE_ET@
+ 
+ buildinclude = $(top_builddir)/include
+ 
+@@ -174,14 +179,20 @@
+ 
+ INCLUDE_readline = @INCLUDE_readline@
+ 
++INCLUDE_ss = @INCLUDE_ss@
++LIB_sl = @LIB_sl@
++LIB_ss = @LIB_ss@
++
++INCLUDE_com_err = @INCLUDE_com_err@
++LIB_com_err = @LIB_com_err@
++
+ LEXLIB = @LEXLIB@
+ 
+ NROFF_MAN = groff -mandoc -Tascii
+ 
+ @KRB4_TRUE@LIB_kafs = @KRB4_TRUE@$(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
+ 
+-@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB5_TRUE@	$(top_builddir)/lib/asn1/libasn1.la
++@KRB5_TRUE@LIB_krb5 = @KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB5_TRUE@LIB_gssapi = @KRB5_TRUE@$(top_builddir)/lib/gssapi/libgssapi.la
+ 
+ CHECK_LOCAL = $(PROGRAMS)
+@@ -225,14 +236,12 @@
+ xnlock_LDADD = $(LDADD)
+ @KRB4_FALSE@@KRB5_FALSE@xnlock_DEPENDENCIES = 
+ @KRB4_FALSE@@KRB5_TRUE@xnlock_DEPENDENCIES =  \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_FALSE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ @KRB4_TRUE@@KRB5_FALSE@xnlock_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_FALSE@$(top_builddir)/lib/kafs/libkafs.la
+ @KRB4_TRUE@@KRB5_TRUE@xnlock_DEPENDENCIES =  \
+ @KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/kafs/libkafs.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la \
+-@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/asn1/libasn1.la
++@KRB4_TRUE@@KRB5_TRUE@$(top_builddir)/lib/krb5/libkrb5.la
+ xnlock_LDFLAGS = 
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+diff -ruN heimdal-0.3e-old/config.guess heimdal-0.3e/config.guess
+--- heimdal-0.3e-old/config.guess	Mon Sep 25 10:15:55 2000
++++ heimdal-0.3e/config.guess	Sat Jun 16 15:14:27 2001
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ #   Free Software Foundation, Inc.
+ 
+-version='2000-09-05'
++timestamp='2001-04-20'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -32,30 +32,41 @@
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+-# don't specify an explicit system type (host/target name).
+-#
+-# Only a few systems have been added to this list; please add others
+-# (but try to keep the structure clean).
+-#
++# don't specify an explicit build system type.
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+ usage="\
+ Usage: $0 [OPTION]
+ 
+-Output the configuration name of this system.
++Output the configuration name of the system \`$me' is run on.
+ 
+ Operation modes:
+-  -h, --help               print this help, then exit
+-  -V, --version            print version number, then exit"
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+ while test $# -gt 0 ; do
+-  case "$1" in
+-    --version | --vers* | -V )
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
+        echo "$version" ; exit 0 ;;
+     --help | --h* | -h )
+        echo "$usage"; exit 0 ;;
+@@ -64,9 +75,7 @@
+     - )	# Use stdin as input.
+        break ;;
+     -* )
+-       exec >&2
+-       echo "$me: invalid option $1"
+-       echo "$help"
++       echo "$me: invalid option $1$help" >&2
+        exit 1 ;;
+     * )
+        break ;;
+@@ -78,19 +87,30 @@
+   exit 1
+ fi
+ 
+-# Use $HOST_CC if defined. $CC may point to a cross-compiler
+-if test x"$CC_FOR_BUILD" = x; then
+-  if test x"$HOST_CC" != x; then
+-    CC_FOR_BUILD="$HOST_CC"
+-  else
+-    if test x"$CC" != x; then
+-      CC_FOR_BUILD="$CC"
+-    else
+-      CC_FOR_BUILD=cc
+-    fi
+-  fi
+-fi
+ 
++dummy=dummy-$$
++trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script.
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int dummy(){}" > $dummy.c
++	for c in cc gcc c89 ; do
++	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
++	  if test $? = 0 ; then
++	     CC_FOR_BUILD="$c"; break
++	  fi
++	done
++	rm -f $dummy.c $dummy.o $dummy.rel
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 8/24/94.)
+@@ -100,12 +120,9 @@
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-dummy=dummy-$$
+-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -129,16 +146,24 @@
+ 	    ibmrt|romp-ibm) machine=romp-ibm ;;
+ 	    *) machine=${UNAME_MACHINE}-unknown ;;
+ 	esac
+-	# The Operating System including object format.
+-	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-		| grep __ELF__ >/dev/null
+-	then
+-	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+-	    # Return netbsd for either.  FIX?
+-	    os=netbsd
+-	else
+-	    os=netbsdelf
+-	fi
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE}" in
++	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
+ 	# The OS release
+ 	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+@@ -247,7 +272,7 @@
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+-    SR2?01:HI-UX/MPP:*:*)
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit 0;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+@@ -308,7 +333,7 @@
+ 	exit 0 ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+-    # "atarist" or "atariste" at least should have a processor 
++    # "atarist" or "atariste" at least should have a processor
+     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+     # to the lowercase version "mint" (or "freemint").  Finally
+     # the system name "TOS" denotes a system which is actually not
+@@ -383,10 +408,13 @@
+ EOF
+ 	$CC_FOR_BUILD $dummy.c -o $dummy \
+ 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm $dummy.c $dummy && exit 0
++	  && rm -f $dummy.c $dummy && exit 0
+ 	rm -f $dummy.c $dummy
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -402,7 +430,7 @@
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+@@ -434,9 +462,17 @@
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+-    i?86:AIX:*:*)
++    i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		sed 's/^		//' << EOF >$dummy.c
+@@ -450,7 +486,7 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
++		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ 		rm -f $dummy.c $dummy
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+@@ -459,9 +495,9 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+-    *:AIX:*:4)
++    *:AIX:*:[45])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+@@ -469,7 +505,7 @@
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=4.${UNAME_RELEASE}
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+@@ -495,10 +531,28 @@
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+     9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+ 	    9000/[678][0-9][0-9])
++              case "${HPUX_REV}" in
++                11.[0-9][0-9])
++                  if [ -x /usr/bin/getconf ]; then
++                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++                        esac ;;
++                    esac
++                  fi ;;
++              esac
++              if [ "${HP_ARCH}" = "" ]; then
+               sed 's/^              //' << EOF >$dummy.c
+ 
+               #define _HPUX_SOURCE
+@@ -533,11 +587,16 @@
+               }
+ EOF
+ 	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
++	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+ 	rm -f $dummy.c $dummy
++	fi ;;
+ 	esac
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
+     3050*:HI-UX:*:*)
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+@@ -564,7 +623,7 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
++	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ 	rm -f $dummy.c $dummy
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+@@ -583,7 +642,7 @@
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+-    i?86:OSF1:*:*)
++    i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+@@ -628,27 +687,28 @@
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+-    CRAY*T3E:*:*:*)
++    CRAY*T3D:*:*:*)
+ 	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
++    CRAY*T3E:*:*:*)
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
+     CRAY*SV1:*:*:*)
+-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'    
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY-2:*:*:*)
+ 	echo cray2-cray-unicos
+         exit 0 ;;
+-    F300:UNIX_System_V:*:*)
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+-    F301:UNIX_System_V:*:*)
+-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+-       exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     sparc*:BSD/OS:*:*)
+@@ -693,57 +753,38 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+-    *:Linux:*:*)
+-
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	ld_help_string=`cd /; ld --help 2>&1`
+-	ld_supported_emulations=`echo $ld_help_string \
+-			 | sed -ne '/supported emulations:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported emulations: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_emulations" in
+-	  *ia64)
+-		echo "${UNAME_MACHINE}-unknown-linux"
+-		exit 0
+-		;;
+-	  i?86linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf_i?86)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	  i?86coff)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit 0
+-		;;
+-	  sparclinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  armlinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf32arm*)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+-		exit 0
+-		;;
+-	  armelf_linux*)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+-		exit 0
+-		;;
+-	  m68klinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf32ppc | elf32ppclinux)
+-		# Determine Lib Version
+-		cat >$dummy.c <<EOF
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	cat >$dummy.c <<EOF
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++int main (int argc, char *argv[]) {
++#else
++int main (argc, argv) int argc; char *argv[]; {
++#endif
++#ifdef __MIPSEB__
++  printf ("%s-unknown-linux-gnu\n", argv[1]);
++#endif
++#ifdef __MIPSEL__
++  printf ("%sel-unknown-linux-gnu\n", argv[1]);
++#endif
++  return 0;
++}
++EOF
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
++	;;
++    ppc:Linux:*:*)
++	# Determine Lib Version
++	cat >$dummy.c <<EOF
+ #include <features.h>
+ #if defined(__GLIBC__)
+ extern char __libc_version[];
+@@ -756,129 +797,127 @@
+ #if defined(__GLIBC__)
+   printf("%s %s\n", __libc_version, __libc_release);
+ #else
+-  printf("unkown\n");
++  printf("unknown\n");
+ #endif
+   return 0;
+ }
+ EOF
+-		LIBC=""
+-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
++	LIBC=""
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
++	if test "$?" = 0 ; then
++		./$dummy | grep 1\.99 > /dev/null
++		if test "$?" = 0 ; then LIBC="libc1" ; fi
++	fi
++	rm -f $dummy.c $dummy
++	echo powerpc-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    alpha:Linux:*:*)
++	cat <<EOF >$dummy.s
++	  .data
++	  \$Lformat:
++		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++	   .text
++		.globl main
++		.align 4
++		.ent main
++	    main:
++		.frame \$30,16,\$26,0
++		ldgp \$29,0(\$27)
++		.prologue 1
++		.long 0x47e03d80 # implver \$0
++		lda \$2,-1
++		.long 0x47e20c21 # amask \$2,\$1
++		lda \$16,\$Lformat
++		mov \$0,\$17
++		not \$1,\$18
++		jsr \$26,printf
++		ldgp \$29,0(\$26)
++		mov 0,\$16
++		jsr \$26,exit
++		.end main
++EOF
++	LIBC=""
++	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
++	if test "$?" = 0 ; then
++		case `./$dummy` in
++		0-0)	UNAME_MACHINE="alpha" ;;
++		1-0)	UNAME_MACHINE="alphaev5" ;;
++		1-1)    UNAME_MACHINE="alphaev56" ;;
++		1-101)	UNAME_MACHINE="alphapca56" ;;
++		2-303)	UNAME_MACHINE="alphaev6" ;;
++		2-307)	UNAME_MACHINE="alphaev67" ;;
++		esac
++		objdump --private-headers $dummy | \
++		  grep ld.so.1 > /dev/null
+ 		if test "$?" = 0 ; then
+-			./$dummy | grep 1\.99 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi	
+-		rm -f $dummy.c $dummy
+-		echo powerpc-unknown-linux-gnu${LIBC}
++			LIBC="libc1"
++		fi
++	fi
++	rm -f $dummy.s $dummy
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    i*86:Linux:*:*)
++	# The BFD linker knows what the default object file format is, so
++	# first see if it will tell us. cd to the root directory to prevent
++	# problems with other programs or directories called `ld' in the path.
++	ld_supported_emulations=`cd /; ld --help 2>&1 \
++			 | sed -ne '/supported emulations:/!d
++				    s/[ 	][ 	]*/ /g
++				    s/.*supported emulations: *//
++				    s/ .*//
++				    p'`
++        case "$ld_supported_emulations" in
++	  i*86linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ 		exit 0
+ 		;;
+-	  shelf_linux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
++	  elf_i*86)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  i*86coff)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit 0
+ 		;;
+ 	esac
+-
+-	if test "${UNAME_MACHINE}" = "alpha" ; then
+-		cat <<EOF >$dummy.s
+-			.data
+-		\$Lformat:
+-			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+-
+-			.text
+-			.globl main
+-			.align 4
+-			.ent main
+-		main:
+-			.frame \$30,16,\$26,0
+-			ldgp \$29,0(\$27)
+-			.prologue 1
+-			.long 0x47e03d80 # implver \$0
+-			lda \$2,-1
+-			.long 0x47e20c21 # amask \$2,\$1
+-			lda \$16,\$Lformat
+-			mov \$0,\$17
+-			not \$1,\$18
+-			jsr \$26,printf
+-			ldgp \$29,0(\$26)
+-			mov 0,\$16
+-			jsr \$26,exit
+-			.end main
+-EOF
+-		LIBC=""
+-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+-		if test "$?" = 0 ; then
+-			case `./$dummy` in
+-			0-0)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			1-0)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			1-1)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			1-101)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			2-303)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-			2-307)
+-				UNAME_MACHINE="alphaev67"
+-				;;
+-			esac
+-
+-			objdump --private-headers $dummy | \
+-			  grep ld.so.1 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi
+-		rm -f $dummy.s $dummy
+-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+-	elif test "${UNAME_MACHINE}" = "mips" ; then
+-	  cat >$dummy.c <<EOF
+-#ifdef __cplusplus
+-#include <stdio.h>  /* for printf() prototype */
+-	int main (int argc, char *argv[]) {
+-#else
+-	int main (argc, argv) int argc; char *argv[]; {
+-#endif
+-#ifdef __MIPSEB__
+-  printf ("%s-unknown-linux-gnu\n", argv[1]);
+-#endif
+-#ifdef __MIPSEL__
+-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+-#endif
+-  return 0;
+-}
+-EOF
+-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+-	  rm -f $dummy.c $dummy
+-	elif test "${UNAME_MACHINE}" = "s390"; then
+-	  echo s390-ibm-linux && exit 0
+-	elif test "${UNAME_MACHINE}" = "x86_64"; then
+-	  echo x86_64-unknown-linux-gnu && exit 0
+-	else
+-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+-	  # or one that does not give us useful --help.
+-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+-	  # If ld does not provide *any* "supported emulations:"
+-	  # that means it is gnuoldld.
+-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+-
+-	  case "${UNAME_MACHINE}" in
+-	  i?86)
+-	    VENDOR=pc;
+-	    ;;
+-	  *)
+-	    VENDOR=unknown;
+-	    ;;
+-	  esac
+-	  # Determine whether the default compiler is a.out or elf
+-	  cat >$dummy.c <<EOF
++	# Either a pre-BFD a.out linker (linux-gnuoldld)
++	# or one that does not give us useful --help.
++	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
++	# If ld does not provide *any* "supported emulations:"
++	# that means it is gnuoldld.
++	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
++	case "${UNAME_MACHINE}" in
++	i*86)
++	  VENDOR=pc;
++	  ;;
++	*)
++	  VENDOR=unknown;
++	  ;;
++	esac
++	# Determine whether the default compiler is a.out or elf
++	cat >$dummy.c <<EOF
+ #include <features.h>
+ #ifdef __cplusplus
+ #include <stdio.h>  /* for printf() prototype */
+@@ -902,16 +941,16 @@
+   return 0;
+ }
+ EOF
+-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+-	  rm -f $dummy.c $dummy
+-	  test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+-	fi ;;
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
++	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	;;
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+ # are messed up and put the nodename in both sysname and nodename.
+-    i?86:DYNIX/ptx:4*:*)
++    i*86:DYNIX/ptx:4*:*)
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+-    i?86:UNIX_SV:4.2MP:2.*)
++    i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+@@ -919,7 +958,7 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+@@ -927,7 +966,7 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+-    i?86:*:5:7*)
++    i*86:*:5:7*)
+         # Fixed at (any) Pentium or better
+         UNAME_MACHINE=i586
+         if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+@@ -936,7 +975,7 @@
+ 	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+ 	fi
+ 	exit 0 ;;
+-    i?86:*:3.2:*)
++    i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+@@ -954,7 +993,7 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
+-    i?86:*DOS:*:*)
++    i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ 	exit 0 ;;
+     pc:*:*:*)
+@@ -982,7 +1021,7 @@
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
++    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -993,21 +1032,24 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+-    m68*:LynxOS:2.*:*)
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1087,6 +1129,9 @@
+     NSR-[KW]:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
+     BS2000:POSIX*:*:*)
+ 	echo bs2000-siemens-sysv
+ 	exit 0 ;;
+@@ -1104,8 +1149,29 @@
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+ 	exit 0 ;;
+-    *:OS/2:*:*)
+-	echo ${UNAME_MACHINE}-pc-os2_emx
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1197,11 +1263,24 @@
+ #endif
+ 
+ #if defined (vax)
+-#if !defined (ultrix)
+-  printf ("vax-dec-bsd\n"); exit (0);
+-#else
+-  printf ("vax-dec-ultrix\n"); exit (0);
+-#endif
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+@@ -1212,7 +1291,7 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
++$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ 
+ # Apollos put the system type in the environment.
+@@ -1248,8 +1327,9 @@
+ cat >&2 <<EOF
+ $0: unable to guess system type
+ 
+-The $version version of this script cannot recognize your system type.
+-Please download the most up to date version of the config scripts:
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
+ 
+     ftp://ftp.gnu.org/pub/gnu/config/
+ 
+@@ -1258,7 +1338,7 @@
+ pertinent to <config-patches@gnu.org> in order to provide the needed
+ information to handle your system.
+ 
+-config.guess version = $version
++config.guess timestamp = $timestamp
+ 
+ uname -m = `(uname -m) 2>/dev/null || echo unknown`
+ uname -r = `(uname -r) 2>/dev/null || echo unknown`
+@@ -1285,7 +1365,7 @@
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+-# time-stamp-start: "version='"
++# time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:
+diff -ruN heimdal-0.3e-old/config.sub heimdal-0.3e/config.sub
+--- heimdal-0.3e-old/config.sub	Mon Sep 25 10:16:33 2000
++++ heimdal-0.3e/config.sub	Sat Jun 16 15:14:27 2001
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ #   Free Software Foundation, Inc.
+ 
+-version='2000-09-11'
++timestamp='2001-04-20'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -60,16 +60,30 @@
+ Canonicalize a configuration name.
+ 
+ Operation modes:
+-  -h, --help               print this help, then exit
+-  -V, --version            print version number, then exit"
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ 
+ help="
+ Try \`$me --help' for more information."
+ 
+ # Parse command line
+ while test $# -gt 0 ; do
+-  case "$1" in
+-    --version | --vers* | -V )
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
+        echo "$version" ; exit 0 ;;
+     --help | --h* | -h )
+        echo "$usage"; exit 0 ;;
+@@ -78,9 +92,7 @@
+     - )	# Use stdin as input.
+        break ;;
+     -* )
+-       exec >&2
+-       echo "$me: invalid option $1"
+-       echo "$help"
++       echo "$me: invalid option $1$help"
+        exit 1 ;;
+ 
+     *local*)
+@@ -105,7 +117,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu*)
++  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -203,22 +215,26 @@
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+-		| arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \
++	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
++	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
++		| pyramid | mn10200 | mn10300 | tron | a29k \
+ 		| 580 | i960 | h8300 \
+-		| x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \
++		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
+ 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+ 		| hppa64 \
+ 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+ 		| alphaev6[78] \
+ 		| we32k | ns16k | clipper | i370 | sh | sh[34] \
+ 		| powerpc | powerpcle \
+-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
++		| 1750a | dsp16xx | pdp10 | pdp11 \
++		| mips16 | mips64 | mipsel | mips64el \
+ 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+ 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+-		| mips64vr5000 | miprs64vr5000el | mcore \
+-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+-		| thumb | d10v | d30v | fr30 | avr)
++		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
++		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
++		| v850 | c4x \
++		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
++		| pj | pjl | h8500)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+@@ -226,13 +242,13 @@
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
+ 		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+-	i[234567]86 | x86_64)
++	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+@@ -242,27 +258,30 @@
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+ 	# FIXME: clean up the formatting here.
+-	vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
++	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
++	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
++	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
+ 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+ 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+ 	      | xmp-* | ymp-* \
+-	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \
++	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
+ 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
+ 	      | hppa2.0n-* | hppa64-* \
+ 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+ 	      | alphaev6[78]-* \
+ 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ 	      | clipper-* | orion-* \
+-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
++	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
++	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
++	      | mips16-* | mips64-* | mipsel-* \
+ 	      | mips64el-* | mips64orion-* | mips64orionel-* \
+ 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ 	      | mipstx39-* | mipstx39el-* | mcore-* \
+-	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
++	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
++	      | [cjt]90-* \
+ 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \
+-	      | bs2000-* | tic54x-* | c54x-* | x86_64-*)
++	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
++	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -353,8 +372,8 @@
+ 		basic_machine=cray2-cray
+ 		os=-unicos
+ 		;;
+-	[ctj]90-cray)
+-		basic_machine=c90-cray
++	[cjt]90)
++		basic_machine=${basic_machine}-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+@@ -410,6 +429,10 @@
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -485,19 +508,19 @@
+ 		basic_machine=i370-ibm
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-	i[34567]86v32)
++	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+-	i[34567]86v4*)
++	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+-	i[34567]86v)
++	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+-	i[34567]86sol2)
++	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+@@ -509,18 +532,6 @@
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+-	i386-go32 | go32)
+-		basic_machine=i386-unknown
+-		os=-go32
+-		;;
+-	i386-mingw32 | mingw32)
+-		basic_machine=i386-unknown
+-		os=-mingw32
+-		;;
+-	i[34567]86-pw32 | pw32)
+-		basic_machine=i586-unknown
+-		os=-pw32
+-		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+@@ -546,6 +557,10 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -576,7 +591,7 @@
+ 		os=-coff
+ 		;;
+ 	msdos)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	mvs)
+@@ -640,6 +655,10 @@
+ 		basic_machine=i960-intel
+ 		os=-mon960
+ 		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
+@@ -675,28 +694,28 @@
+         pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+-	pentium | p5 | k5 | k6 | nexen)
++	pentium | p5 | k5 | k6 | nexgen)
+ 		basic_machine=i586-pc
+ 		;;
+ 	pentiumpro | p6 | 6x86 | athlon)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentiumii | pentium2)
+-		basic_machine=i786-pc
++		basic_machine=i686-pc
+ 		;;
+-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
++	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+-	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+@@ -711,6 +730,10 @@
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -901,6 +924,10 @@
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+@@ -908,9 +935,9 @@
+ 		basic_machine=we32k-att
+ 		;;
+ 	sh3 | sh4)
+-		base_machine=sh-unknown
++		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv9)
++	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+         cydra)
+@@ -932,6 +959,9 @@
+ 		basic_machine=c4x-none
+ 		os=-coff
+ 		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+@@ -991,12 +1021,13 @@
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+-	      | -openstep* | -oskit* | -conix* | -pw32*)
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+ 		case $basic_machine in
+-		    x86-* | i[34567]86-*)
++		    x86-* | i*86-*)
+ 			;;
+ 		    *)
+ 			os=-nto$os
+@@ -1089,7 +1120,7 @@
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+-        -*mint | -*MiNT)
++        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 	        os=-mint
+ 		;;
+ 	-none)
+@@ -1123,6 +1154,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
++	pdp10-*)
++		os=-tops20
++		;;
+         pdp11-*)
+ 		os=-none
+ 		;;
+@@ -1231,7 +1265,7 @@
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+-	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
+ 	*-rom68k)
+@@ -1309,7 +1343,7 @@
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+-			-*mint | -*MiNT)
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
+ 		esac
+@@ -1322,7 +1356,7 @@
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+-# time-stamp-start: "version='"
++# time-stamp-start: "timestamp='"
+ # time-stamp-format: "%:y-%02m-%02d"
+ # time-stamp-end: "'"
+ # End:
+diff -ruN heimdal-0.3e-old/configure heimdal-0.3e/configure
+--- heimdal-0.3e-old/configure	Mon Feb  5 19:03:23 2001
++++ heimdal-0.3e/configure	Sat Jun 16 15:14:36 2001
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # From configure.in Revision: 1.270 .
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by Autoconf 2.49d for heimdal 0.3e.
++# Generated by Autoconf 2.49b for heimdal 0.3e.
+ #
+ # Report bugs to <heimdal-bugs@pdc.kth.se>.
+ #
+@@ -10,141 +10,194 @@
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ 
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) lt_cv_sys_path_separator=';' ;;
++    *)     lt_cv_sys_path_separator=':' ;;
++  esac
+ fi
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
+ else
+-  as_expr=false
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
+ fi
+ 
+-rm -f conftest conftest.exe conftest.file
+-echo >conftest.file
+-if ln -s conftest.file conftest 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conftest.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
+-    as_ln_s='ln -s'
+-  fi
+-elif ln conftest.file conftest 2>/dev/null; then
+-  as_ln_s=ln
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
+ else
+-  as_ln_s='cp -p'
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
+ fi
+-rm -f conftest conftest.exe conftest.file
+ 
+-# Find out how to test for executable files. Don't use a zero-byte file,
+-# as systems may use methods other than mode bits to determine executability.
+-cat >conftest.file <<_ASEOF
+-#! /bin/sh
+-exit 0
+-_ASEOF
+-chmod +x conftest.file
+-if test -x conftest.file >/dev/null 2>&1; then
+-  as_executable_p="test -x"
+-elif test -f conftest.file >/dev/null 2>&1; then
+-  as_executable_p="test -f"
+-else
+-  { { echo "$as_me:57: error: cannot check whether a file is executable on this system" >&5
+-echo "$as_me: error: cannot check whether a file is executable on this system" >&2;}
+-   { (exit 1); exit 1; }; }
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
+ fi
+-rm -f conftest.file
+ 
+ # Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+-  as_unset=unset
++if (unset FOO) >/dev/null 2>&1; then
++  ac_unset=unset
+ else
+-  as_unset=false
++  ac_unset=false
+ fi
+ 
+ # NLS nuisances.
+-$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
+-$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
+-$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
+-$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
+-$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
+-$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
+-$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
+-$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
++$ac_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
++$ac_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
++$ac_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
++$ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
++$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
++$ac_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
++$ac_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
++$ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.
+-as_nl='
++ac_nl='
+ '
+-IFS=" 	$as_nl"
++IFS=" 	$ac_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+-
+-# Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# so uname gets run too.
+-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+-
+-# Name of the executable.
+-as_me=`echo "$0" | sed 's,.*/,,'`
+-
+-cat >config.log <<EOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+-
+-It was created by $as_me (heimdal 0.3e) 2.49d, executed with
+- > $0 $@
+-
+-EOF
+-{
+-cat <<_ASUNAME
+-## ---------- ##
+-## Platform.  ##
+-## ---------- ##
+-
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
+-
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+-
+-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+-
+-PATH = $PATH
+-
+-_ASUNAME
+-} >>config.log
+-
+-cat >>config.log <<EOF
+-## ------------ ##
+-## Core tests.  ##
+-## ------------ ##
+-
+-EOF
+-
+-# File descriptor usage:
+-# 0 standard input
+-# 1 file creation
+-# 2 errors and warnings
+-# 5 compiler messages saved in config.log
+-# 6 checking for... messages and results
+-exec 5>>config.log
+-exec 6>&1
++$ac_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
+ 
+ #
+ # Initializations.
+@@ -154,28 +207,24 @@
+ subdirs=
+ MFLAGS= MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+-
+ # Maximum number of lines to put in a shell here document.
+ # This variable seems obsolete.  It should probably be removed, and
+ # only ac_max_sed_lines should be used.
+ : ${ac_max_here_lines=38}
+-
+-# Avoid depending upon Character Ranges.
+-ac_cr_az='abcdefghijklmnopqrstuvwxyz'
+-ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-ac_cr_09='0123456789'
+-ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
+-
+ # Sed expression to map a string onto a valid sh and CPP variable names.
+-ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
+-ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
++ac_tr_sh='sed y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
++ac_tr_cpp='sed y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
+ 
+-ac_default_prefix=/usr/heimdal
++# By default always use an empty string as the executable extension.
++# Only change it if the script calls AC_EXEEXT.
++ac_exeext=
++# By default assume that objects files use an extension of .o.  Only
++# change it if the script calls AC_OBJEXT.
++ac_objext=o
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+ #include <sys/types.h>
+-#include <sys/stat.h>
+ #if STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+@@ -200,6 +249,7 @@
+ #if HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
++ac_default_prefix=/usr/heimdal
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -220,12 +270,6 @@
+ verbose=
+ x_includes=NONE
+ x_libraries=NONE
+-
+-# Installation directory options.
+-# These are left unexpanded so users can "make install exec_prefix=/foo"
+-# and all the variables that are supposed to be based on exec_prefix
+-# by default will actually change.
+-# Use braces instead of parens because sh, perl, etc. also accept them.
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+@@ -239,13 +283,6 @@
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
+ 
+-# Identity of this package.
+-PACKAGE_NAME='heimdal'
+-PACKAGE_TARNAME='heimdal'
+-PACKAGE_VERSION='0.3e'
+-PACKAGE_STRING='heimdal 0.3e'
+-PACKAGE_BUGREPORT='heimdal-bugs@pdc.kth.se'
+-
+ ac_prev=
+ for ac_option
+ do
+@@ -291,20 +328,16 @@
+   -disable-* | --disable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+-      { { echo "$as_me:295: error: invalid feature name: $ac_feature" >&5
+-echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
+-   { (exit 1); exit 1; }; }
++    expr "x$ac_feature" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
++      { echo "configure: error: invalid feature name: $ac_feature" >&2; exit 1; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+     eval "enable_$ac_feature=no" ;;
+ 
+   -enable-* | --enable-*)
+     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+-      { { echo "$as_me:305: error: invalid feature name: $ac_feature" >&5
+-echo "$as_me: error: invalid feature name: $ac_feature" >&2;}
+-   { (exit 1); exit 1; }; }
++    expr "x$ac_feature" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
++      { echo "configure: error: invalid feature name: $ac_feature" >&2; exit 1; }
+     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+     case $ac_option in
+       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+@@ -484,10 +517,8 @@
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+-      { { echo "$as_me:488: error: invalid package name: $ac_package" >&5
+-echo "$as_me: error: invalid package name: $ac_package" >&2;}
+-   { (exit 1); exit 1; }; }
++    expr "x$ac_package" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
++      { echo "configure: error: invalid package name: $ac_package" >&2; exit 1; }
+     ac_package=`echo $ac_package| sed 's/-/_/g'`
+     case $ac_option in
+       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+@@ -498,10 +529,8 @@
+   -without-* | --without-*)
+     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
+-      { { echo "$as_me:502: error: invalid package name: $ac_package" >&5
+-echo "$as_me: error: invalid package name: $ac_package" >&2;}
+-   { (exit 1); exit 1; }; }
++    expr "x$ac_package" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
++      { echo "configure: error: invalid package name: $ac_package" >&2; exit 1; }
+     ac_package=`echo $ac_package | sed 's/-/_/g'`
+     eval "with_$ac_package=no" ;;
+ 
+@@ -523,31 +552,24 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { { echo "$as_me:526: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; }
++  -*) { echo "configure: error: unrecognized option: $ac_option
++Try \`configure --help' for more information." >&2; exit 1; }
+     ;;
+ 
+   *=*)
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
+-      { { echo "$as_me:537: error: invalid variable name: $ac_envvar" >&5
+-echo "$as_me: error: invalid variable name: $ac_envvar" >&2;}
+-   { (exit 1); exit 1; }; }
++    expr "x$ac_envvar" : ".*[^a-zA-Z0-9_]" >/dev/null &&
++      { echo "configure: error: invalid variable name: $ac_envvar" >&2; exit 1; }
+     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+     eval "$ac_envvar='$ac_optarg'"
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+-    { echo "$as_me:546: WARNING: you should use --build, --host, --target" >&5
+-echo "$as_me: WARNING: you should use --build, --host, --target" >&2;}
+-    expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
+-      { echo "$as_me:549: WARNING: invalid host type: $ac_option" >&5
+-echo "$as_me: WARNING: invalid host type: $ac_option" >&2;}
++    echo "configure: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^a-zA-Z0-9.]" >/dev/null &&
++      echo "configure: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+@@ -556,9 +578,7 @@
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { { echo "$as_me:559: error: missing argument to $ac_option" >&5
+-echo "$as_me: error: missing argument to $ac_option" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: missing argument to $ac_option" >&2; exit 1; }
+ fi
+ 
+ # Be sure to have absolute paths.
+@@ -570,9 +590,7 @@
+   case $ac_val in
+     [\\/$]* | ?:[\\/]* ) ;;
+     NONE ) ;;
+-    *)  { { echo "$as_me:573: error: expected an absolute path for --$ac_var: $ac_val" >&5
+-echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2;}
+-   { (exit 1); exit 1; }; };;
++    *)  { echo "configure: error: expected an absolute path for --$ac_var: $ac_val" >&2; exit 1; };;
+   esac
+ done
+ 
+@@ -586,10 +604,8 @@
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    { echo "$as_me:589: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&5
+-echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2;}
++    echo "configure: WARNING: If you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -598,8 +614,6 @@
+ ac_tool_prefix=
+ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+ 
+-test "$silent" = yes && exec 6>/dev/null
+-
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+@@ -616,13 +630,9 @@
+ fi
+ if test ! -r $srcdir/$ac_unique_file; then
+   if test "$ac_srcdir_defaulted" = yes; then
+-    { { echo "$as_me:619: error: cannot find sources in $ac_confdir or .." >&5
+-echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2;}
+-   { (exit 1); exit 1; }; }
++    { echo "configure: error: cannot find sources in $ac_confdir or .." >&2; exit 1; }
+   else
+-    { { echo "$as_me:623: error: cannot find sources in $srcdir" >&5
+-echo "$as_me: error: cannot find sources in $srcdir" >&2;}
+-   { (exit 1); exit 1; }; }
++    { echo "configure: error: cannot find sources in $srcdir" >&2; exit 1; }
+   fi
+ fi
+ srcdir=`echo "$srcdir" | sed 's%\([^/]\)/*$%\1%'`
+@@ -650,10 +660,6 @@
+ ac_env_LDFLAGS_value=$LDFLAGS
+ ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
+ ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ ac_env_CPPFLAGS_value=$CPPFLAGS
+ ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+@@ -775,6 +781,12 @@
+   --with-readline=dir                use readline in dir
+   --with-readline-lib=dir            use readline libraries in dir
+   --with-readline-include=dir        use readline headers in dir
++  --with-com_err=dir                use com_err in dir
++  --with-com_err-lib=dir            use com_err libraries in dir
++  --with-com_err-include=dir        use com_err headers in dir
++  --with-ss=dir                use ss in dir
++  --with-ss-lib=dir            use ss libraries in dir
++  --with-ss-include=dir        use ss headers in dir
+   --with-hesiod=dir                use hesiod in dir
+   --with-hesiod-lib=dir            use hesiod libraries in dir
+   --with-hesiod-include=dir        use hesiod headers in dir
+@@ -785,7 +797,6 @@
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPP         C preprocessor
+   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+               headers in a nonstandard directory <include dir>
+ 
+@@ -821,13 +832,11 @@
+     elif test -f $ac_sub_srcdir/configure; then
+       echo
+       $SHELL $ac_sub_srcdir/configure  --help=recursive
+-    elif test -f $ac_sub_srcdir/configure.ac ||
+-           test -f $ac_sub_srcdir/configure.in; then
++    elif test -f $ac_sub_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+-      { echo "$as_me:829: WARNING: no configuration information is in $ac_subdir" >&5
+-echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2;}
++      echo "configure: WARNING: no configuration information is in $ac_subdir" >&2
+     fi
+     cd $ac_popdir
+   done
+@@ -836,7 +845,7 @@
+ test -n "$ac_init_help" && exit 0
+ if $ac_init_version; then
+   cat <<\EOF
+-configure (heimdal 0.3e) 2.49d
++configure (heimdal 0.3e) 2.49b
+ 
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000
+ Free Software Foundation, Inc.
+@@ -846,6 +855,8 @@
+   exit 0
+ fi
+ 
++trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
++
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
+ # Also quote any args containing shell meta-characters.
+@@ -868,51 +879,28 @@
+   # Get rid of the leading space.
+ done
+ 
+-# When interrupted or exit'd, cleanup temporary files, and complete
+-# config.log.  We remove comments because anyway the quotes in there
+-# would cause problems or look ugly.
+-trap 'exit_status=$?
+-  # Save into config.log some information that might help in debugging.
+-  echo >&5
+-  echo "## ----------------- ##" >&5
+-  echo "## Cache variables.  ##" >&5
+-  echo "## ----------------- ##" >&5
+-  echo >&5
+-  # The following way of writing the cache mishandles newlines in values,
+-{
+-  (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      sed -n \
+-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
+-    *)
+-      sed -n \
+-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} >&5
+-  sed "/^$/d" confdefs.h >conftest.log
+-  if test -s conftest.log; then
+-    echo >&5
+-    echo "## ------------ ##" >&5
+-    echo "## confdefs.h.  ##" >&5
+-    echo "## ------------ ##" >&5
+-    echo >&5
+-    cat conftest.log >&5
+-  fi
+-  (echo; echo) >&5
+-  test "$ac_signal" != 0 &&
+-    echo "$as_me: caught signal $ac_signal" >&5
+-  echo "$as_me: exit $exit_status" >&5
+-  rm -rf conftest* confdefs* core core.* *.core $ac_clean_files &&
+-    exit $exit_status
+-     ' 0
+-for ac_signal in 1 2 13 15; do
+-  trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
+-done
+-ac_signal=0
++# File descriptor usage:
++# 0 standard input
++# 1 file creation
++# 2 errors and warnings
++# 3 some systems may open it to /dev/tty
++# 4 used on the Kubota Titan
++# 6 checking for... messages and results
++# 5 compiler messages saved in config.log
++if test "$silent" = yes; then
++  exec 6>/dev/null
++else
++  exec 6>&1
++fi
++exec 5>./config.log
++
++echo "\
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by configure (heimdal 0.3e) 2.49b, executed with
++ > $0 $ac_configure_args
++" >&5
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -rf conftest* confdefs.h
+@@ -939,16 +927,14 @@
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:942: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
++    echo "loading cache $cache_file"
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . $cache_file;;
+       *)                      . ./$cache_file;;
+     esac
+   fi
+ else
+-  { echo "$as_me:950: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
++  echo "creating cache $cache_file"
+   >$cache_file
+ fi
+ 
+@@ -963,37 +949,30 @@
+   eval ac_new_val="\$ac_env_${ac_var}_value"
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:966: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      echo "configure: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2
+       ac_suggest_removing_cache=: ;;
+     ,set)
+-      { echo "$as_me:970: WARNING: \`$ac_var' was not set in the previous run" >&5
+-echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
++      echo "configure: WARNING: \`$ac_var' was not set in the previous run" >&2
+       ac_suggest_removing_cache=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:976: WARNING: \`$ac_var' has changed since the previous run:" >&5
+-echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
+-        { echo "$as_me:978: WARNING:   former value:  $ac_old_val" >&5
+-echo "$as_me: WARNING:   former value:  $ac_old_val" >&2;}
+-        { echo "$as_me:980: WARNING:   current value: $ac_new_val" >&5
+-echo "$as_me: WARNING:   current value: $ac_new_val" >&2;}
++        echo "configure: WARNING: \`$ac_var' has changed since the previous run:" >&2
++        echo "configure: WARNING:   former value:  $ac_old_val" >&2
++        echo "configure: WARNING:   current value: $ac_new_val" >&2
+         ac_suggest_removing_cache=:
+       fi;;
+   esac
+ done
+ if $ac_suggest_removing_cache; then
+-  { echo "$as_me:987: WARNING: changes in the environment can compromise the build" >&5
+-echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
+-  { echo "$as_me:989: WARNING: consider removing $cache_file and starting over" >&5
+-echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
++  echo "configure: WARNING: changes in the environment can compromise the build" >&2
++  echo "configure: WARNING: consider removing $cache_file and starting over" >&2
+ fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+@@ -1005,17 +984,18 @@
+ 
+ ac_config_headers="$ac_config_headers include/config.h"
+ 
+-ac_config_commands="$ac_config_commands default-1"
++  ac_config_commands="$ac_config_commands default-1"
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:1018: checking for $ac_word" >&5
++echo "configure:998: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1028,7 +1008,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ break
+ done
+@@ -1037,10 +1017,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1040: result: $CC" >&5
++  echo "configure:1020: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1043: result: no" >&5
++  echo "configure:1023: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1049,7 +1029,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:1052: checking for $ac_word" >&5
++echo "configure:1032: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1062,7 +1042,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="gcc"
+ break
+ done
+@@ -1071,23 +1051,21 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1074: result: $ac_ct_CC" >&5
++  echo "configure:1054: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1077: result: no" >&5
++  echo "configure:1057: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:1090: checking for $ac_word" >&5
++echo "configure:1068: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1100,7 +1078,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ break
+ done
+@@ -1109,10 +1087,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1112: result: $CC" >&5
++  echo "configure:1090: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1115: result: no" >&5
++  echo "configure:1093: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1121,7 +1099,7 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1124: checking for $ac_word" >&5
++echo "configure:1102: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1134,7 +1112,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="cc"
+ break
+ done
+@@ -1143,23 +1121,21 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1146: result: $ac_ct_CC" >&5
++  echo "configure:1124: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1149: result: no" >&5
++  echo "configure:1127: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+ fi
+ 
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:1162: checking for $ac_word" >&5
++echo "configure:1138: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1173,7 +1149,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+   ac_prog_rejected=yes
+   continue
+@@ -1200,10 +1176,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1203: result: $CC" >&5
++  echo "configure:1179: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1206: result: no" >&5
++  echo "configure:1182: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1214,7 +1190,7 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:1217: checking for $ac_word" >&5
++echo "configure:1193: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1227,7 +1203,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ break
+ done
+@@ -1236,10 +1212,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:1239: result: $CC" >&5
++  echo "configure:1215: result: $CC" >&5
+ echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:1242: result: no" >&5
++  echo "configure:1218: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1252,7 +1228,7 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:1255: checking for $ac_word" >&5
++echo "configure:1231: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -1265,7 +1241,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ break
+ done
+@@ -1274,10 +1250,10 @@
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:1277: result: $ac_ct_CC" >&5
++  echo "configure:1253: result: $ac_ct_CC" >&5
+ echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:1280: result: no" >&5
++  echo "configure:1256: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -1289,17 +1265,12 @@
+ 
+ fi
+ 
+-test -z "$CC" && { { echo "$as_me:1292: error: no acceptable cc found in \$PATH" >&5
+-echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
++test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
+ 
+-echo "$as_me:1296: checking for object suffix" >&5
+-echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line 1302 "configure"
++echo "configure:1270: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++#line 1273 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1310,41 +1281,48 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:1314: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1317: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
+-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+-       break;;
+-  esac
+-done
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1285: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  # FIXME: these cross compiler hacks should be removed for autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./conftest$ac_exeext'; { (eval echo configure:1289: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++      cross_compiling=yes
++    else
++      { echo "configure: error: cannot run C compiled programs.
++To enable cross compilation, use \`--host'." >&2; exit 1; }
++    fi
++  fi
++fi
++echo "configure:1300: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-{ { echo "$as_me:1329: error: cannot compute OBJEXT: cannot compile" >&5
+-echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
+-   { (exit 1); exit 1; }; }
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  echo "configure:1305: result: no" >&5
++echo "${ECHO_T}no" >&6
++{ echo "configure: error: C compiler cannot create executables" >&2; exit 77; }
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++echo "configure:1310: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "configure:1312: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
+ 
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+-fi
+-echo "$as_me:1336: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
+-OBJEXT=$ac_cv_objext
+-ac_objext=$OBJEXT
+-echo "$as_me:1340: checking for executable suffix" >&5
+-echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
+-if test "${ac_cv_exeext+set}" = set; then
++echo "configure:1315: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1346 "configure"
++#line 1321 "configure"
+ #include "confdefs.h"
++#ifndef __GNUC__
++  choke me
++#endif
+ 
+ int
+ main ()
+@@ -1354,66 +1332,28 @@
+   return 0;
+ }
+ _ACEOF
+-# Try without -o first, disregard a.out.
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:1359: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1362: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
+-  case $ac_file in
+-    *.$ac_ext | *.out | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          export ac_cv_exeext
+-          break;;
+-    * ) break;;
+-  esac
+-done
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-
+-rm -f a.out a.exe conftest$ac_cv_exeext
+-
+-# We have not set ac_exeext yet which is needed by `ac_link'.
+-ac_exeext=$ac_cv_exeext
+-if { (eval echo "$as_me:1382: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1385: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
+-  case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          export ac_cv_exeext
+-          break;;
+-    * ) break;;
+-  esac
+-done
++rm -f conftest.$ac_objext
++if { (eval echo configure:1336: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_compiler_gnu=yes
+ else
+-  { { echo "$as_me:1401: error: cannot compute EXEEXT: cannot compile and link" >&5
+-echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
+-   { (exit 1); exit 1; }; }
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_compiler_gnu=no
+ fi
+-
+-rm -f conftest.$ac_ext conftest$ac_cv_exeext
++rm -f conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:1409: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-echo "$as_me:1413: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 1416 "configure"
++echo "configure:1347: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++echo "configure:1350: checking for object suffix" >&5
++echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
++if test "${ac_cv_objext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1356 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1424,109 +1364,79 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:1428: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1431: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1433: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1436: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # FIXME: these cross compiler hacks should be removed for autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { (eval echo "$as_me:1441: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1444: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-      cross_compiling=yes
+-    else
+-      { { echo "$as_me:1451: error: cannot run C compiled programs.
+-To enable cross compilation, use \`--host'." >&5
+-echo "$as_me: error: cannot run C compiled programs.
+-To enable cross compilation, use \`--host'." >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
+-  fi
+-fi
+-echo "$as_me:1459: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++if { (eval echo configure:1367: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++  for ac_file in conftest.*; do
++  case $ac_file in
++    *.$ac_ext) ;;
++    *) ac_cv_objext=`echo $ac_file | sed s/conftest.//` ;;
++  esac
++  done
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-echo "$as_me:1464: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-{ { echo "$as_me:1466: error: C compiler cannot create executables" >&5
+-echo "$as_me: error: C compiler cannot create executables" >&2;}
+-   { (exit 77); exit 77; }; }
++  rm -f conftest.$ac_ext
++  { echo "configure: error: cannot compile" >&2; exit 1; }
+ fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
+-echo "$as_me:1471: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:1473: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
++fi
++echo "configure:1379: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$ac_cv_objext
++rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+-echo "$as_me:1476: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++echo "configure:1385: checking for executable suffix" >&5
++echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
++if test "${ac_cv_exeext+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  case "$CYGWIN $MINGW32 $EMXOS2" in
++  *yes*) ac_cv_exeext=.exe ;;
++  *)
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1482 "configure"
++#line 1394 "configure"
+ #include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-#ifndef __GNUC__
+-       choke me
+-#endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1497: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1500: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1502: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1505: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_compiler_gnu=yes
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:1406: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  if test ! -f conftest; then
++    for ac_file in conftest.*; do
++       case $ac_file in
++         *.$ac_ext | *.o | *.obj | *.xcoff) ;;
++         *) ac_cv_exeext=`expr "$ac_file" : 'conftest\(.*\)'`;;
++       esac
++     done
++   fi
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_compiler_gnu=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  { echo "configure: error: cannot compile and link" >&2; exit 1; }
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+-
++rm -f conftest$ac_exeext conftest.$ac_ext
++  test -n "$ac_cv_exeext" && ac_cv_exeext=no;;
++esac
+ fi
+-echo "$as_me:1517: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
++echo "configure:1424: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6
++EXEEXT=
++test "$ac_cv_exeext" != no && EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+ CFLAGS="-g"
+-echo "$as_me:1523: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++echo "configure:1433: checking whether ${CC-cc} accepts -g" >&5
++echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1529 "configure"
++#line 1439 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -1538,25 +1448,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1541: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1544: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1546: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1549: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:1451: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_prog_cc_g=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_g=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:1559: result: $ac_cv_prog_cc_g" >&5
++echo "configure:1460: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -1573,149 +1474,44 @@
+     CFLAGS=
+   fi
+ fi
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++echo "configure:1483: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if test "${ac_cv_prog_CPP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "${CC-cc} -E" "${CC-cc} -E -traditional-cpp" "/lib/cpp"
++    do
++      # Use a header file that comes with gcc, so configuring glibc
++# with a fresh cross-compiler works.
++# On the NeXT, cc -E runs the code through the compiler's parser,
++# not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1586: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1589: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1591: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1594: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line 1606 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1619: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1622: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1624: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1627: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-continue
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line 1637 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1649: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1652: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1654: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1657: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  break
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-done
+-echo '#ifdef __cplusplus' >>confdefs.h
+-echo $ac_declaration      >>confdefs.h
+-echo '#endif'             >>confdefs.h
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:1686: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+-  CPP=
+-fi
+-if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-      # Double quotes because CPP needs to be expanded
+-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+-    do
+-      # Use a header file that comes with gcc, so configuring glibc
+-# with a fresh cross-compiler works.
+-# On the NeXT, cc -E runs the code through the compiler's parser,
+-# not just through cpp. "Syntax error" is here to catch this case.
+-ac_c_preproc_warn_flag=maybe
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 1705 "configure"
++#line 1506 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:1710: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:1716: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_c_preproc_warn_flag=maybe
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1513: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -1723,24 +1519,18 @@
+ else
+   ac_cpp_err=yes
+ fi
+-if test -z "$ac_cpp_err"; then
+-  # Now check whether non-existent headers can be detected and how
++
++# Now check whether non-existent headers can be detected and how
+ # Skip if ac_cpp_err is not empty - ac_cpp is broken
+ if test -z "$ac_cpp_err"; then
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1731 "configure"
++#line 1527 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:1735: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:1741: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1532: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -1748,27 +1538,21 @@
+ else
+   ac_cpp_err=yes
+ fi
+-if test -z "$ac_cpp_err"; then
+-  # cannot detect missing includes at all
+-ac_cpp_err=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  if test "x$ac_cpp_err" = xmaybe; then
++
++  if test -z "$ac_cpp_err"; then
++    # cannot detect missing includes at all
++    ac_cpp_err=yes
++  else
++    if test "x$ac_cpp_err" = xmaybe; then
+       ac_c_preproc_warn_flag=yes
+     else
+       ac_c_preproc_warn_flag=
+     fi
+     ac_cpp_err=
++  fi
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++rm -f conftest*
+ 
+-fi
+-rm -f conftest.err conftest.$ac_ext
+       if test -z "$ac_cpp_err"; then
+         break
+       fi
+@@ -1782,22 +1566,16 @@
+ # with a fresh cross-compiler works.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+-ac_c_preproc_warn_flag=maybe
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 1787 "configure"
++#line 1570 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:1792: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:1798: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_c_preproc_warn_flag=maybe
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1577: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -1805,24 +1583,18 @@
+ else
+   ac_cpp_err=yes
+ fi
+-if test -z "$ac_cpp_err"; then
+-  # Now check whether non-existent headers can be detected and how
++
++# Now check whether non-existent headers can be detected and how
+ # Skip if ac_cpp_err is not empty - ac_cpp is broken
+ if test -z "$ac_cpp_err"; then
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 1813 "configure"
++#line 1591 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:1817: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:1823: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:1596: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -1830,787 +1602,1153 @@
+ else
+   ac_cpp_err=yes
+ fi
+-if test -z "$ac_cpp_err"; then
+-  # cannot detect missing includes at all
+-ac_cpp_err=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  if test "x$ac_cpp_err" = xmaybe; then
++
++  if test -z "$ac_cpp_err"; then
++    # cannot detect missing includes at all
++    ac_cpp_err=yes
++  else
++    if test "x$ac_cpp_err" = xmaybe; then
+       ac_c_preproc_warn_flag=yes
+     else
+       ac_c_preproc_warn_flag=
+     fi
+     ac_cpp_err=
++  fi
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++rm -f conftest*
+ 
+-fi
+-rm -f conftest.err conftest.$ac_ext
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:1856: result: $CPP" >&5
++echo "configure:1622: result: $CPP" >&5
+ echo "${ECHO_T}$CPP" >&6
+ if test -n "$ac_cpp_err"; then
+-  { { echo "$as_me:1859: error: C preprocessor \"$CPP\" fails sanity check" >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: C preprocessor \"$CPP\" fails sanity check" >&2; exit 1; }
+ fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-echo "$as_me:1869: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++echo "configure:1642: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 1877 "configure"
+-#include "confdefs.h"
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:1926: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1929: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:1931: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:1934: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}gcc"
++break
+ done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+ 
+ fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:1951: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:1954: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+-ac_aux_dir=
+-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+-  if test -f $ac_dir/install-sh; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install-sh -c"
+-    break
+-  elif test -f $ac_dir/install.sh; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install.sh -c"
+-    break
+-  elif test -f $ac_dir/shtool; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/shtool install -c"
+-    break
+-  fi
+-done
+-if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:1976: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+-   { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1664: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1667: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ 
+-# Find a good install program.  We prefer a C program (faster),
+-# so one script is as good as another.  But avoid the broken or
+-# incompatible versions:
+-# SysV /etc/install, /usr/sbin/install
+-# SunOS /usr/etc/install
+-# IRIX /sbin/install
+-# AIX /bin/install
+-# AmigaOS /C/install, which installs bootblocks on floppy discs
+-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+-# ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:1996: checking for a BSD compatible install" >&5
+-echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
+-if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo "configure:1676: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-    ac_save_IFS=$IFS; IFS=':'
+-  for ac_dir in $PATH; do
+-    # Account for people who put trailing slashes in PATH elements.
+-    case $ac_dir/ in
+-    / | ./ | .// | /cC/* \
+-    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
+-    | /usr/ucb/* ) ;;
+-    *)
+-      # OSF1 and SCO ODT 3.0 have their own names for install.
+-      # Don't use installbsd from OSF since it installs stuff as root
+-      # by default.
+-      for ac_prog in ginstall scoinst install; do
+-        if test -f "$ac_dir/$ac_prog"; then
+-	  if test $ac_prog = install &&
+-            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+-	    # AIX install.  It has an incompatible calling convention.
+-	    :
+-	  elif test $ac_prog = install &&
+-	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
+-	    # program-specific install script used by HP pwplus--don't use.
+-	    :
+-	  else
+-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+-	    break 2
+-	  fi
+-	fi
+-      done
+-      ;;
+-    esac
+-  done
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="gcc"
++break
++done
+ 
+ fi
+-  if test "${ac_cv_path_install+set}" = set; then
+-    INSTALL=$ac_cv_path_install
+-  else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
+-    # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
+-    INSTALL=$ac_install_sh
+-  fi
+-fi
+-echo "$as_me:2045: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
+-
+-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+-# It thinks the first close brace ends the variable substitution.
+-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+-
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+-
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+-
+-echo "$as_me:2056: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+-# Just in case
+-sleep 1
+-echo timestamp > conftestfile
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments.  Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+-   if test "$*" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t $srcdir/configure conftestfile`
+-   fi
+-   if test "$*" != "X $srcdir/configure conftestfile" \
+-      && test "$*" != "X conftestfile $srcdir/configure"; then
+-
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # if, for instance, CONFIG_SHELL is bash and it inherits a
+-      # broken ls alias from the environment.  This has actually
+-      # happened.  Such a system could not be considered "sane".
+-      { { echo "$as_me:2079: error: ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment" >&5
+-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+-
+-   test "$2" = conftestfile
+-   )
+-then
+-   # Ok.
+-   :
+-else
+-   { { echo "$as_me:2092: error: newly created file is older than distributed files!
+-Check your system clock" >&5
+-echo "$as_me: error: newly created file is older than distributed files!
+-Check your system clock" >&2;}
+-   { (exit 1); exit 1; }; }
+ fi
+-rm -f conftest*
+-echo "$as_me:2099: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-if test "$program_transform_name" = s,x,x,; then
+-  program_transform_name=
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1698: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  # Double any \ or $.  echo might interpret backslashes.
+-  cat <<\EOF >conftestsed
+-s,\\,\\\\,g; s,\$,$$,g
+-EOF
+-  program_transform_name=`echo $program_transform_name | sed -f conftestsed`
+-  rm -f conftestsed
++  echo "configure:1701: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+-test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,${program_prefix},;$program_transform_name"
+-# Use a double $ so make ignores it.
+-test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
+ 
+-# sed with no file args requires a program.
+-test -z "$program_transform_name" && program_transform_name="s,x,x,"
+-
+-test x"${MISSING+set}" = xset || \
+-  MISSING="\${SHELL} `CDPATH=: && cd $ac_aux_dir && pwd`/missing"
+-if eval "$MISSING --run :"; then
+-  am_missing_run="$MISSING --run "
+-else
+-  am_missing_run=
+-  am_backtick='`'
+-  { echo "$as_me:2127: WARNING: ${am_backtick}missing' script is too old or missing" >&5
+-echo "$as_me: WARNING: ${am_backtick}missing' script is too old or missing" >&2;}
++  CC=$ac_ct_CC
+ fi
+ 
+-for ac_prog in mawk gawk nawk awk
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2135: checking for $ac_word" >&5
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++echo "configure:1712: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AWK+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$AWK"; then
+-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   ac_save_IFS=$IFS; IFS=':'
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_AWK="$ac_prog"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="${ac_tool_prefix}cc"
+ break
+ done
+ 
+ fi
+ fi
+-AWK=$ac_cv_prog_AWK
+-if test -n "$AWK"; then
+-  echo "$as_me:2157: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1734: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2160: result: no" >&5
++  echo "configure:1737: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-  test -n "$AWK" && break
+-done
+-
+-echo "$as_me:2167: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:1746: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftestmake <<\EOF
+-all:
+-	@echo 'ac_maketemp="${MAKE}"'
+-EOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+-  eval ac_cv_prog_make_${ac_make}_set=no
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="cc"
++break
++done
++
+ fi
+-rm -f conftestmake
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:2187: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-  SET_MAKE=
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1768: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2191: result: no" >&5
++  echo "configure:1771: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-  SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+-if test "${enable_dependency_tracking+set}" = set; then
+-  enableval="$enable_dependency_tracking"
+-
+-fi;
+-if test "x$enable_dependency_tracking" = xno; then
+-  AMDEP="#"
+-else
+-  am_depcomp="$ac_aux_dir/depcomp"
+-  if test ! -f "$am_depcomp"; then
+-    AMDEP="#"
+-  else
+-    AMDEP=
+-  fi
++  CC=$ac_ct_CC
+ fi
+ 
+-if test -z "$AMDEP"; then
+-  AMDEPBACKSLASH='\'
+-else
+-  AMDEPBACKSLASH=
+ fi
+-
+-if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
+-  DEPDIR=.deps
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo "configure:1782: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  DEPDIR=_deps
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++  ac_prog_rejected=yes
++  continue
+ fi
++ac_cv_prog_CC="cc"
++break
++done
+ 
+-ac_config_commands="$ac_config_commands default-2"
+-
+-# test to see if srcdir already configured
+-if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  { { echo "$as_me:2229: error: source directory already configured; run \"make distclean\" there first" >&5
+-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+-   { (exit 1); exit 1; }; }
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    set dummy "$ac_dir/$ac_word" ${1+"$@"}
++    shift
++    ac_cv_prog_CC="$@"
++  fi
+ fi
+-
+-# Define the identity of the package.
+-PACKAGE=heimdal
+-VERSION=0.3e
+-
+-cat >>confdefs.h <<EOF
+-#define PACKAGE "$PACKAGE"
+-EOF
+-
+-cat >>confdefs.h <<EOF
+-#define VERSION "$VERSION"
+-EOF
+-
+-# Some tools Automake needs.
+-
+-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
+-
+-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+-
+-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
+-
+-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+-
+-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+-if test -z "$install_sh"; then
+-   install_sh="$ac_aux_dir/install-sh"
+-   test -f "$install_sh" || install_sh="$ac_aux_dir/install.sh"
+-   test -f "$install_sh" || install_sh="${am_missing_run}${ac_auxdir}/install-sh"
+-         install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1823: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "configure:1826: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-depcc="$CC"
+-depcpp="$CPP"
+-echo "$as_me:2269: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++echo "configure:1837: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-
+-if test -z "$AMDEP"; then
+-  echo '#include "conftest.h"' > conftest.c
+-  echo 'int i;' > conftest.h
+-
+-  am_cv_CC_dependencies_compiler_type=none
+-  for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "$am_depcomp"`; do
+-    case "$depmode" in
+-    nosideeffect)
+-      # after this tag, mechanisms are not by side-effect, so they'll
+-      # only be used when explicitly requested
+-      if test "x$enable_dependency_tracking" = xyes; then
+-	continue
+-      else
+-	break
+-      fi
+-      ;;
+-    none) break ;;
+-    esac
+-    if depmode="$depmode" \
+-       source=conftest.c object=conftest.o \
+-       depfile=conftest.Po tmpdepfile=conftest.TPo \
+-       $SHELL $am_depcomp $depcc -c conftest.c 2>/dev/null &&
+-       grep conftest.h conftest.Po > /dev/null 2>&1; then
+-      am_cv_CC_dependencies_compiler_type="$depmode"
+-      break
+-    fi
+-  done
+-
+-  rm -f conftest.*
+-else
+-  am_cv_CC_dependencies_compiler_type=none
+-fi
+-
+-fi
+-
+-echo "$as_me:2310: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+-CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
+-
+-# Make sure we can run config.sub.
+-$ac_config_sub sun4 >/dev/null 2>&1 ||
+-  { { echo "$as_me:2316: error: cannot run $ac_config_sub" >&5
+-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-echo "$as_me:2320: checking build system type" >&5
+-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+-if test "${ac_cv_build+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_build_alias=$build_alias
+-test -z "$ac_cv_build_alias" &&
+-  ac_cv_build_alias=`$ac_config_guess`
+-test -z "$ac_cv_build_alias" &&
+-  { { echo "$as_me:2329: error: cannot guess build type; you must specify one" >&5
+-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+-   { (exit 1); exit 1; }; }
+-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+-  { { echo "$as_me:2333: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:2338: result: $ac_cv_build" >&5
+-echo "${ECHO_T}$ac_cv_build" >&6
+-build=$ac_cv_build
+-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-echo "$as_me:2345: checking host system type" >&5
+-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+-if test "${ac_cv_host+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_host_alias=$host_alias
+-test -z "$ac_cv_host_alias" &&
+-  ac_cv_host_alias=$ac_cv_build_alias
+-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+-  { { echo "$as_me:2354: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-fi
+-echo "$as_me:2359: result: $ac_cv_host" >&5
+-echo "${ECHO_T}$ac_cv_host" >&6
+-host=$ac_cv_host
+-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-
+-CANONICAL_HOST=$host
+-
+-sunos=no
+-case "$host" in
+-*-*-sunos4*)
+-	sunos=40
+-	;;
+-*-*-solaris2.7)
+-	sunos=57
+-	;;
+-*-*-solaris2.8)
+-	sunos=58
+-	;;
+-*-*-solaris2*)
+-	sunos=50
+-	;;
+-esac
+-if test "$sunos" != no; then
+-
+-cat >>confdefs.h <<EOF
+-#define SunOS $sunos
+-EOF
+-
+-fi
+-
+-aix=no
+-case "$host" in
+-*-*-aix3*)
+-	aix=3
+-	;;
+-*-*-aix4*)
+-	aix=4
+-	;;
+-esac
+-
+-#test -z "$CFLAGS" && CFLAGS="-g"
+-
+-for ac_prog in 'bison -y' byacc
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2407: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_YACC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$YACC"; then
+-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   ac_save_IFS=$IFS; IFS=':'
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_YACC="$ac_prog"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ break
+ done
+ 
+ fi
+ fi
+-YACC=$ac_cv_prog_YACC
+-if test -n "$YACC"; then
+-  echo "$as_me:2429: result: $YACC" >&5
+-echo "${ECHO_T}$YACC" >&6
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "configure:1859: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
+ else
+-  echo "$as_me:2432: result: no" >&5
++  echo "configure:1862: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-  test -n "$YACC" && break
+-done
+-test -n "$YACC" || YACC="yacc"
+-
+-for ac_prog in flex lex
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2444: checking for $ac_word" >&5
++echo "configure:1875: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_LEX+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$LEX"; then
+-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+ else
+   ac_save_IFS=$IFS; IFS=':'
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_LEX="$ac_prog"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_CC="$ac_prog"
+ break
+ done
+ 
+ fi
+ fi
+-LEX=$ac_cv_prog_LEX
+-if test -n "$LEX"; then
+-  echo "$as_me:2466: result: $LEX" >&5
+-echo "${ECHO_T}$LEX" >&6
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "configure:1897: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
+ else
+-  echo "$as_me:2469: result: no" >&5
++  echo "configure:1900: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-  test -n "$LEX" && break
+-done
+-test -n "$LEX" || LEX="${am_missing_run}flex"
+-
+-for ac_prog in flex lex
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2481: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_LEX+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$LEX"; then
+-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_LEX="$ac_prog"
+-break
++  test -n "$ac_ct_CC" && break
+ done
+ 
++  CC=$ac_ct_CC
+ fi
+-fi
+-LEX=$ac_cv_prog_LEX
+-if test -n "$LEX"; then
+-  echo "$as_me:2503: result: $LEX" >&5
+-echo "${ECHO_T}$LEX" >&6
+-else
+-  echo "$as_me:2506: result: no" >&5
+-echo "${ECHO_T}no" >&6
++
+ fi
+ 
+-  test -n "$LEX" && break
+-done
+-test -n "$LEX" || LEX=":"
++test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" >&2; exit 1; }
+ 
+-if test -z "$LEXLIB"
+-then
+-  echo "$as_me:2516: checking for yywrap in -lfl" >&5
+-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
+-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lfl  $LIBS"
++echo "configure:1914: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 2524 "configure"
++#line 1917 "configure"
+ #include "confdefs.h"
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char yywrap ();
+ int
+ main ()
+ {
+-yywrap ();
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2543: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2546: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:2548: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2551: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_cv_lib_fl_yywrap=yes
++if { (eval echo configure:1929: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  # FIXME: these cross compiler hacks should be removed for autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./conftest$ac_exeext'; { (eval echo configure:1933: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++      cross_compiling=yes
++    else
++      { echo "configure: error: cannot run C compiled programs.
++To enable cross compilation, use \`--host'." >&2; exit 1; }
++    fi
++  fi
++fi
++echo "configure:1944: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_fl_yywrap=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  echo "configure:1949: result: no" >&5
++echo "${ECHO_T}no" >&6
++{ echo "configure: error: C compiler cannot create executables" >&2; exit 77; }
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:2562: result: $ac_cv_lib_fl_yywrap" >&5
+-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
+-if test $ac_cv_lib_fl_yywrap = yes; then
+-  LEXLIB="-lfl"
+-else
+-  echo "$as_me:2567: checking for yywrap in -ll" >&5
+-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
+-if test "${ac_cv_lib_l_yywrap+set}" = set; then
++echo "configure:1954: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
++echo "configure:1956: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6
++
++echo "configure:1959: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ll  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 2575 "configure"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 1965 "configure"
+ #include "confdefs.h"
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
++#ifndef __GNUC__
++  choke me
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char yywrap ();
++
+ int
+ main ()
+ {
+-yywrap ();
++
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2594: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2597: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:2599: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2602: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_cv_lib_l_yywrap=yes
++rm -f conftest.$ac_objext
++if { (eval echo configure:1980: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_compiler_gnu=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_l_yywrap=no
+-fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_compiler_gnu=no
+ fi
+-echo "$as_me:2613: result: $ac_cv_lib_l_yywrap" >&5
++rm -f conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "configure:1991: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++CFLAGS="-g"
++echo "configure:1998: checking whether ${CC-cc} accepts -g" >&5
++echo $ECHO_N "checking whether ${CC-cc} accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 2004 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2016: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_cc_g=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++fi
++echo "configure:2025: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++echo "configure:2048: checking for ${CC-cc} option to accept ANSI C" >&5
++echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 2066 "configure"
++#include "confdefs.h"
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:2105: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_stdc=$ac_arg; break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "configure:2119: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "configure:2122: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++ac_aux_dir=
++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f $ac_dir/shtool; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { echo "configure: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2; exit 1; }
++fi
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"
++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# Find a good install program.  We prefer a C program (faster),
++# so one script is as good as another.  But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
++# ./install, which can be erroneously created by make from ./install.sh.
++echo "configure:2162: checking for a BSD compatible install" >&5
++echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
++if test -z "$INSTALL"; then
++if test "${ac_cv_path_install+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    ac_save_IFS=$IFS; IFS=':'
++  for ac_dir in $PATH; do
++    # Account for people who put trailing slashes in PATH elements.
++    case $ac_dir/ in
++    / | ./ | .// | /cC/* \
++    | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
++    | /usr/ucb/* ) ;;
++    *)
++      # OSF1 and SCO ODT 3.0 have their own names for install.
++      # Don't use installbsd from OSF since it installs stuff as root
++      # by default.
++      for ac_prog in ginstall scoinst install; do
++        if test -f "$ac_dir/$ac_prog"; then
++	  if test $ac_prog = install &&
++            grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$ac_dir/$ac_prog -c"
++	    break 2
++	  fi
++	fi
++      done
++      ;;
++    esac
++  done
++  IFS=$ac_save_IFS
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL=$ac_cv_path_install
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL=$ac_install_sh
++  fi
++fi
++echo "configure:2211: result: $INSTALL" >&5
++echo "${ECHO_T}$INSTALL" >&6
++
++# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
++# It thinks the first close brace ends the variable substitution.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++echo "configure:2222: checking whether build environment is sane" >&5
++echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++# Just in case
++sleep 1
++echo timestamp > conftestfile
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftestfile`
++   fi
++   if test "$*" != "X $srcdir/configure conftestfile" \
++      && test "$*" != "X conftestfile $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" >&2; exit 1; }
++   fi
++
++   test "$2" = conftestfile
++   )
++then
++   # Ok.
++   :
++else
++   { echo "configure: error: newly created file is older than distributed files!
++Check your system clock" >&2; exit 1; }
++fi
++rm -f conftest*
++echo "configure:2259: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++if test "$program_transform_name" = s,x,x,; then
++  program_transform_name=
++else
++  # Double any \ or $.  echo might interpret backslashes.
++  cat <<\EOF >conftestsed
++s,\\,\\\\,g; s,\$,$$,g
++EOF
++  program_transform_name=`echo $program_transform_name | sed -f conftestsed`
++  rm -f conftestsed
++fi
++test "$program_prefix" != NONE &&
++  program_transform_name="s,^,${program_prefix},;$program_transform_name"
++# Use a double $ so make ignores it.
++test "$program_suffix" != NONE &&
++  program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
++
++# sed with no file args requires a program.
++test -z "$program_transform_name" && program_transform_name="s,x,x,"
++
++test x"${MISSING+set}" = xset || \
++  MISSING="\${SHELL} `CDPATH=:; cd $ac_aux_dir && pwd`/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run :"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  am_backtick='`'
++  echo "configure: WARNING: ${am_backtick}missing' script is too old or missing" >&2
++fi
++
++for ac_prog in mawk gawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2295: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AWK+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_AWK="$ac_prog"
++break
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "configure:2317: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "configure:2320: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "configure:2327: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftestmake <<\EOF
++all:
++	@echo 'ac_maketemp="${MAKE}"'
++EOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftestmake
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "configure:2347: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  SET_MAKE=
++else
++  echo "configure:2351: result: no" >&5
++echo "${ECHO_T}no" >&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then
++  enableval="$enable_dependency_tracking"
++
++fi;
++if test "x$enable_dependency_tracking" = xno; then
++  AMDEP="#"
++else
++  am_depcomp="$ac_aux_dir/depcomp"
++  if test ! -f "$am_depcomp"; then
++    AMDEP="#"
++  else
++    AMDEP=
++  fi
++fi
++
++if test -z "$AMDEP"; then
++  AMDEPBACKSLASH='\'
++else
++  AMDEPBACKSLASH=
++fi
++
++if test -d .deps || mkdir .deps 2> /dev/null || test -d .deps; then
++  DEPDIR=.deps
++else
++  DEPDIR=_deps
++fi
++
++ac_config_commands="$ac_config_commands default-2"
++
++# test to see if srcdir already configured
++if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" &&
++   test -f $srcdir/config.status; then
++  { echo "configure: error: source directory already configured; run \"make distclean\" there first" >&2; exit 1; }
++fi
++
++# Define the identity of the package.
++PACKAGE=heimdal
++VERSION=0.3e
++
++cat >>confdefs.h <<EOF
++#define PACKAGE "$PACKAGE"
++EOF
++
++cat >>confdefs.h <<EOF
++#define VERSION "$VERSION"
++EOF
++
++# Some tools Automake needs.
++
++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"}
++
++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
++
++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"}
++
++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
++
++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
++if test -z "$install_sh"; then
++   install_sh="$ac_aux_dir/install-sh"
++   test -f "$install_sh" || install_sh="$ac_aux_dir/install.sh"
++   test -f "$install_sh" || install_sh="${am_missing_run}${ac_auxdir}/install-sh"
++         install_sh="`echo $install_sh | sed -e 's/\${SHELL}//'`"
++fi
++
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++
++depcc="$CC"
++depcpp="$CPP"
++echo "configure:2430: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++if test -z "$AMDEP"; then
++  echo '#include "conftest.h"' > conftest.c
++  echo 'int i;' > conftest.h
++
++  am_cv_CC_dependencies_compiler_type=none
++  for depmode in `sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < "$am_depcomp"`; do
++    case "$depmode" in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode="$depmode" \
++       source=conftest.c object=conftest.o \
++       depfile=conftest.Po tmpdepfile=conftest.TPo \
++       $SHELL $am_depcomp $depcc -c conftest.c -o conftest.o 2>/dev/null &&
++       grep conftest.h conftest.Po > /dev/null 2>&1; then
++      am_cv_CC_dependencies_compiler_type="$depmode"
++      break
++    fi
++  done
++
++  rm -f conftest.*
++else
++  am_cv_CC_dependencies_compiler_type=none
++fi
++
++fi
++
++echo "configure:2474: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++CCDEPMODE="depmode=$am_cv_CC_dependencies_compiler_type"
++
++# Make sure we can run config.sub.
++$ac_config_sub sun4 >/dev/null 2>&1 ||
++  { echo "configure: error: cannot run $ac_config_sub" >&2; exit 1; }
++
++echo "configure:2482: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6
++if test "${ac_cv_build+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_build_alias=$build_alias
++test -z "$ac_cv_build_alias" &&
++  ac_cv_build_alias=`$ac_config_guess`
++test -z "$ac_cv_build_alias" &&
++  { echo "configure: error: cannot guess build type; you must specify one" >&2; exit 1; }
++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || exit 1
++
++fi
++echo "configure:2495: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6
++build=$ac_cv_build
++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++echo "configure:2502: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_host_alias=$host_alias
++test -z "$ac_cv_host_alias" &&
++  ac_cv_host_alias=$ac_cv_build_alias
++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || exit 1
++
++fi
++echo "configure:2513: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6
++host=$ac_cv_host
++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++CANONICAL_HOST=$host
++
++sunos=no
++case "$host" in
++*-*-sunos4*)
++	sunos=40
++	;;
++*-*-solaris2.7)
++	sunos=57
++	;;
++*-*-solaris2.8)
++	sunos=58
++	;;
++*-*-solaris2*)
++	sunos=50
++	;;
++esac
++if test "$sunos" != no; then
++	
++cat >>confdefs.h <<EOF
++#define SunOS $sunos
++EOF
++
++fi
++
++aix=no
++case "$host" in
++*-*-aix3*)
++	aix=3
++	;;
++*-*-aix4*)
++	aix=4
++	;;
++esac
++
++#test -z "$CFLAGS" && CFLAGS="-g"
++
++for ac_prog in 'bison -y' byacc
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2561: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_YACC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$YACC"; then
++  ac_cv_prog_YACC="$YACC" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_YACC="$ac_prog"
++break
++done
++
++fi
++fi
++YACC=$ac_cv_prog_YACC
++if test -n "$YACC"; then
++  echo "configure:2583: result: $YACC" >&5
++echo "${ECHO_T}$YACC" >&6
++else
++  echo "configure:2586: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$YACC" && break
++done
++test -n "$YACC" || YACC="yacc"
++
++for ac_prog in flex lex
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2598: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_LEX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$LEX"; then
++  ac_cv_prog_LEX="$LEX" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_LEX="$ac_prog"
++break
++done
++
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  echo "configure:2620: result: $LEX" >&5
++echo "${ECHO_T}$LEX" >&6
++else
++  echo "configure:2623: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX="${am_missing_run}flex"
++
++for ac_prog in flex lex
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2635: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_LEX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$LEX"; then
++  ac_cv_prog_LEX="$LEX" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_LEX="$ac_prog"
++break
++done
++
++fi
++fi
++LEX=$ac_cv_prog_LEX
++if test -n "$LEX"; then
++  echo "configure:2657: result: $LEX" >&5
++echo "${ECHO_T}$LEX" >&6
++else
++  echo "configure:2660: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$LEX" && break
++done
++test -n "$LEX" || LEX=":"
++
++if test -z "$LEXLIB"
++then
++
++echo "configure:2671: checking for yywrap in -lfl" >&5
++echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
++if test "${ac_cv_lib_fl_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lfl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2679 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2698: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_fl_yywrap=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_fl_yywrap=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:2708: result: $ac_cv_lib_fl_yywrap" >&5
++echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
++if test $ac_cv_lib_fl_yywrap = yes; then
++  LEXLIB="-lfl"
++else
++
++echo "configure:2714: checking for yywrap in -ll" >&5
++echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
++if test "${ac_cv_lib_l_yywrap+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ll  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2722 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char yywrap ();
++int
++main ()
++{
++yywrap ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2741: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_l_yywrap=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_l_yywrap=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:2751: result: $ac_cv_lib_l_yywrap" >&5
+ echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
+ if test $ac_cv_lib_l_yywrap = yes; then
+   LEXLIB="-ll"
+@@ -2620,82 +2758,1154 @@
+ 
+ fi
+ 
+-if test "x$LEX" != "x:"; then
+-  echo "$as_me:2624: checking lex output file root" >&5
+-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
+-if test "${ac_cv_prog_lex_root+set}" = set; then
++if test "x$LEX" != "x:"; then
++  echo "configure:2762: checking lex output file root" >&5
++echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_root+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # The minimal lex program is just a single line: %%.  But some broken lexes
++# (Solaris, I think it was) want two %% lines, so accommodate them.
++echo '%%
++%%' | $LEX
++if test -f lex.yy.c; then
++  ac_cv_prog_lex_root=lex.yy
++elif test -f lexyy.c; then
++  ac_cv_prog_lex_root=lexyy
++else
++  { echo "configure: error: cannot find output from $LEX; giving up" >&2; exit 1; }
++fi
++fi
++echo "configure:2779: result: $ac_cv_prog_lex_root" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
++LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++
++echo "configure:2783: checking whether yytext is a pointer" >&5
++echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # POSIX says lex can declare yytext either as a pointer or an array; the
++# default is implementation-dependent. Figure out which it is, since
++# not all implementations provide the %pointer and %array declarations.
++ac_cv_prog_lex_yytext_pointer=no
++echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
++ac_save_LIBS=$LIBS
++LIBS="$LIBS $LEXLIB"
++cat >conftest.$ac_ext <<_ACEOF
++`cat $LEX_OUTPUT_ROOT.c`
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:2799: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_prog_lex_yytext_pointer=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_save_LIBS
++rm -f "${LEX_OUTPUT_ROOT}.c"
++
++fi
++echo "configure:2810: result: $ac_cv_prog_lex_yytext_pointer" >&5
++echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
++if test $ac_cv_prog_lex_yytext_pointer = yes; then
++
++cat >>confdefs.h <<\EOF
++#define YYTEXT_POINTER 1
++EOF
++
++fi
++
++fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++echo "configure:2825: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++break
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "configure:2847: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "configure:2850: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++echo "configure:2859: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_RANLIB="ranlib"
++break
++done
++
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "configure:2882: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "configure:2885: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++fi
++
++for ac_prog in mawk gawk nawk awk
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo "configure:2896: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AWK+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_AWK="$ac_prog"
++break
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "configure:2918: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "configure:2921: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "configure:2928: checking for ln -s or something else" >&5
++echo $ECHO_N "checking for ln -s or something else... $ECHO_C" >&6
++if test "${ac_cv_prog_LN_S+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f conftestdata
++if ln -s X conftestdata 2>/dev/null
++then
++  rm -f conftestdata
++  ac_cv_prog_LN_S="ln -s"
++else
++  touch conftestdata1
++  if ln conftestdata1 conftestdata2; then
++    rm -f conftestdata*
++    ac_cv_prog_LN_S=ln
++  else
++    ac_cv_prog_LN_S=cp
++  fi
++fi
++fi
++LN_S="$ac_cv_prog_LN_S"
++echo "configure:2949: result: $ac_cv_prog_LN_S" >&5
++echo "${ECHO_T}$ac_cv_prog_LN_S" >&6
++
++# Check whether --with-mips_abi or --without-mips_abi was given.
++if test "${with_mips_abi+set}" = set; then
++  withval="$with_mips_abi"
++
++fi;
++
++case "$host_os" in
++irix*)
++with_mips_abi="${with_mips_abi:-yes}"
++if test -n "$GCC"; then
++
++# GCC < 2.8 only supports the O32 ABI. GCC >= 2.8 has a flag to select
++# which ABI to use, but only supports (as of 2.8.1) the N32 and 64 ABIs.
++#
++# Default to N32, but if GCC doesn't grok -mabi=n32, we assume an old
++# GCC and revert back to O32. The same goes if O32 is asked for - old
++# GCCs doesn't like the -mabi option, and new GCCs can't output O32.
++#
++# Don't you just love *all* the different SGI ABIs?
++
++case "${with_mips_abi}" in
++        32|o32) abi='-mabi=32';  abilibdirext=''     ;;
++       n32|yes) abi='-mabi=n32'; abilibdirext='32'  ;;
++        64) abi='-mabi=64';  abilibdirext='64'   ;;
++	no) abi=''; abilibdirext='';;
++         *) { echo "configure: error: \"Invalid ABI specified\"" >&2; exit 1; } ;;
++esac
++if test -n "$abi" ; then
++ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
++echo "configure:2981: checking if $CC supports the $abi option" >&5
++echo $ECHO_N "checking if $CC supports the $abi option... $ECHO_C" >&6
++if eval "test \"\${$ac_foo+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS $abi"
++cat >conftest.$ac_ext <<_ACEOF
++#line 2990 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++int x;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3002: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  eval $ac_foo=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval $ac_foo=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++CFLAGS="$save_CFLAGS"
++
++fi
++
++ac_res=`eval echo \\\$$ac_foo`
++echo "configure:3015: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6
++if test $ac_res = no; then
++# Try to figure out why that failed...
++case $abi in
++	-mabi=32)
++	save_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -mabi=n32"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 3024 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++int x;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3036: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_res=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_res=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++	CLAGS="$save_CFLAGS"
++	if test $ac_res = yes; then
++		# New GCC
++		{ echo "configure: error: $CC does not support the $with_mips_abi ABI" >&2; exit 1; }
++	fi
++	# Old GCC
++	abi=''
++	abilibdirext=''
++	;;
++	-mabi=n32|-mabi=64)
++		if test $with_mips_abi = yes; then
++			# Old GCC, default to O32
++			abi=''
++			abilibdirext=''
++		else
++			# Some broken GCC
++			{ echo "configure: error: $CC does not support the $with_mips_abi ABI" >&2; exit 1; }
++		fi
++	;;
++esac
++fi #if test $ac_res = no; then
++fi #if test -n "$abi" ; then
++else
++case "${with_mips_abi}" in
++        32|o32) abi='-32'; abilibdirext=''     ;;
++       n32|yes) abi='-n32'; abilibdirext='32'  ;;
++        64) abi='-64'; abilibdirext='64'   ;;
++	no) abi=''; abilibdirext='';;
++         *) { echo "configure: error: \"Invalid ABI specified\"" >&2; exit 1; } ;;
++esac
++fi #if test -n "$GCC"; then
++;;
++esac
++
++CC="$CC $abi"
++libdir="$libdir$abilibdirext"
++
++echo "configure:3081: checking for __attribute__" >&5
++echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
++if test "${ac_cv___attribute__+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++cat >conftest.$ac_ext <<_ACEOF
++#line 3088 "configure"
++#include "confdefs.h"
++
++#include <stdlib.h>
++
++int
++main ()
++{
++
++static void foo(void) __attribute__ ((noreturn));
++
++static void
++foo(void)
++{
++  exit(1);
++}
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:3110: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ac_cv___attribute__=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv___attribute__=no
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++fi
++
++if test "$ac_cv___attribute__" = "yes"; then
++
++cat >>confdefs.h <<\EOF
++#define HAVE___ATTRIBUTE__ 1
++EOF
++
++fi
++echo "configure:3127: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6
++
++# Check whether --enable-shared or --disable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval="$enable_shared"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_shared=yes ;;
++no) enable_shared=no ;;
++*)
++  enable_shared=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_shared=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_shared=no
++fi;
++# Check whether --enable-static or --disable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval="$enable_static"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_static=yes ;;
++no) enable_static=no ;;
++*)
++  enable_static=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_static=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_static=yes
++fi;
++# Check whether --enable-fast-install or --disable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval="$enable_fast_install"
++  p=${PACKAGE-default}
++case $enableval in
++yes) enable_fast_install=yes ;;
++no) enable_fast_install=no ;;
++*)
++  enable_fast_install=no
++  # Look at the argument we got.  We use all the common list separators.
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
++  for pkg in $enableval; do
++    if test "X$pkg" = "X$p"; then
++      enable_fast_install=yes
++    fi
++  done
++  IFS="$ac_save_ifs"
++  ;;
++esac
++else
++  enable_fast_install=yes
++fi;
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi;
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "configure:3207: checking for ld used by GCC" >&5
++echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | [A-Za-z]:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "configure:3237: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "configure:3240: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
++  for ac_dir in $PATH; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++	test "$with_gnu_ld" != no && break
++      else
++	test "$with_gnu_ld" != yes && break
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "configure:3270: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "configure:3273: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" >&2; exit 1; }
++echo "configure:3277: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++  lt_cv_prog_gnu_ld=yes
++else
++  lt_cv_prog_gnu_ld=no
++fi
++fi
++echo "configure:3289: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++echo "configure:3293: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++if test "${lt_cv_ld_reload_flag+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++echo "configure:3300: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++reload_flag=$lt_cv_ld_reload_flag
++test -n "$reload_flag" && reload_flag=" $reload_flag"
++
++echo "configure:3305: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++if test "${lt_cv_path_NM+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm=$ac_dir/${ac_tool_prefix}nm
++    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	lt_cv_path_NM="$tmp_nm -p"
++	break
++      else
++	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	continue # so that we can try to find one that supports BSD flags
++      fi
++    fi
++  done
++  IFS="$ac_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++
++NM="$lt_cv_path_NM"
++echo "configure:3341: result: $NM" >&5
++echo "${ECHO_T}$NM" >&6
++
++echo "configure:3344: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++if test "${ac_cv_prog_LN_S+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f conftest.sym conftest.file
++echo >conftest.file
++if ln -s conftest.file conftest.sym 2>/dev/null; then
++  ac_cv_prog_LN_S="ln -s"
++elif ln conftest.file conftest.sym 2>/dev/null; then
++  ac_cv_prog_LN_S=ln
++else
++  ac_cv_prog_LN_S=cp
++fi
++rm -f conftest.sym conftest.file
++fi
++LN_S=$ac_cv_prog_LN_S
++
++if test "$ac_cv_prog_LN_S" = "ln -s"; then
++  echo "configure:3363: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "configure:3366: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6
++fi
++
++echo "configure:3370: checking how to recognise dependant libraries" >&5
++echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
++if test "${lt_cv_deplibs_check_method+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# ['file_magic [regex]'] -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi4*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin* | mingw* | pw32*)
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.012)
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    ;;
++  *) # Darwin 1.3 on
++    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  ;;
++
++freebsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20*|hpux11*)
++  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libc.sl
++  ;;
++
++irix5* | irix6*)
++  case $host_os in
++  irix5*)
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case $LD in
++    *-32|*"-32 ") libmagic=32-bit;;
++    *-n32|*"-n32 ") libmagic=N32;;
++    *-64|*"-64 ") libmagic=64-bit;;
++    *) libmagic=never-match;;
++    esac
++    # this will be overridden with pass_all, but let us keep it just in case
++    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
++    ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux-gnu*)
++  case $host_cpu in
++  alpha* | i*86 | powerpc* | sparc* | ia64* )
++    lt_cv_deplibs_check_method=pass_all ;;
++  *)
++    # glibc up to 2.1.1 does not perform some relocations on ARM
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
++  esac
++  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++osf3* | osf4* | osf5*)
++  # this will be overridden with pass_all, but let us keep it just in case
++  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  lt_cv_file_magic_test_file=/lib/libc.so
++  ;;
++
++sysv5uw[78]* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  esac
++  ;;
++esac
++
++fi
++echo "configure:3538: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo "configure:3544: checking command to parse $NM output" >&5
++echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  ;;
++irix*)
++  symcode='[BCDEGRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $host_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
++  symcode='[ABCDGISTW]'
++fi
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo configure:3621: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo configure:3624: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") >&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if { (eval echo configure:3675: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$save_LIBS"
++	  CFLAGS="$save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++else
++  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
++fi
++if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
++  echo "configure:3712: result: failed" >&5
++echo "${ECHO_T}failed" >&6
++else
++  echo "configure:3715: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++fi
++
++for ac_header in dlfcn.h
++do
++ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
++
++echo "configure:3723: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # The minimal lex program is just a single line: %%.  But some broken lexes
+-# (Solaris, I think it was) want two %% lines, so accommodate them.
+-echo '%%
+-%%' | $LEX
+-if test -f lex.yy.c; then
+-  ac_cv_prog_lex_root=lex.yy
+-elif test -f lexyy.c; then
+-  ac_cv_prog_lex_root=lexyy
++  cat >conftest.$ac_ext <<_ACEOF
++#line 3729 "configure"
++#include "confdefs.h"
++#include <$ac_header>
++
++_ACEOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:3735: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++
++if test -z "$ac_cpp_err"; then
++  eval "$ac_ac_Header=yes"
+ else
+-  { { echo "$as_me:2638: error: cannot find output from $LEX; giving up" >&5
+-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+-   { (exit 1); exit 1; }; }
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_Header=no"
+ fi
++rm -f conftest*
++
+ fi
+-echo "$as_me:2643: result: $ac_cv_prog_lex_root" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
+-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
++echo "configure:3756: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
++if test `eval echo '${'$ac_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<EOF
++#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
++EOF
+ 
+-echo "$as_me:2647: checking whether yytext is a pointer" >&5
+-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
+-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++fi
++done
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo "configure:3770: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # POSIX says lex can declare yytext either as a pointer or an array; the
+-# default is implementation-dependent. Figure out which it is, since
+-# not all implementations provide the %pointer and %array declarations.
+-ac_cv_prog_lex_yytext_pointer=no
+-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
+-ac_save_LIBS=$LIBS
+-LIBS="$LIBS $LEXLIB"
+-cat >conftest.$ac_ext <<_ACEOF
+-`cat $LEX_OUTPUT_ROOT.c`
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:2663: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2666: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:2668: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2671: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_cv_prog_lex_yytext_pointer=yes
++  case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="/usr/bin:$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "configure:3825: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure:3828: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_save_LIBS
+-rm -f "${LEX_OUTPUT_ROOT}.c"
+ 
+-fi
+-echo "$as_me:2683: result: $ac_cv_prog_lex_yytext_pointer" >&5
+-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+-if test $ac_cv_prog_lex_yytext_pointer = yes; then
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo "configure:3834: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++  /*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++  ?:/*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++  ;;
++  *)
++  ac_save_MAGIC_CMD="$MAGIC_CMD"
++  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="/usr/bin:$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    egrep "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
+ 
+-cat >>confdefs.h <<\EOF
+-#define YYTEXT_POINTER 1
+ EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++  MAGIC_CMD="$ac_save_MAGIC_CMD"
++  ;;
++esac
++fi
+ 
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "configure:3889: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "configure:3892: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
++  else
++    MAGIC_CMD=:
++  fi
+ fi
+ 
++  fi
++  ;;
++esac
++
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:2698: checking for $ac_word" >&5
++echo "configure:3908: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2708,7 +3918,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ break
+ done
+@@ -2717,10 +3927,10 @@
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:2720: result: $RANLIB" >&5
++  echo "configure:3930: result: $RANLIB" >&5
+ echo "${ECHO_T}$RANLIB" >&6
+ else
+-  echo "$as_me:2723: result: no" >&5
++  echo "configure:3933: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+@@ -2729,7 +3939,7 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:2732: checking for $ac_word" >&5
++echo "configure:3942: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2742,7 +3952,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
++  test -f "$ac_dir/$ac_word" || continue
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ break
+ done
+@@ -2752,1152 +3962,2868 @@
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:2755: result: $ac_ct_RANLIB" >&5
++  echo "configure:3965: result: $ac_ct_RANLIB" >&5
+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+-  echo "$as_me:2758: result: no" >&5
++  echo "configure:3968: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+   RANLIB=$ac_ct_RANLIB
++fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++echo "configure:3978: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_STRIP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++  ac_save_IFS=$IFS; IFS=':'
++ac_dummy="$PATH"
++for ac_dir in $ac_dummy; do
++  IFS=$ac_save_IFS
++  test -z "$ac_dir" && ac_dir=.
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++break
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "configure:4000: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
+ else
+-  RANLIB="$ac_cv_prog_RANLIB"
++  echo "configure:4003: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-for ac_prog in mawk gawk nawk awk
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:2771: checking for $ac_word" >&5
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
++echo "configure:4012: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_AWK+set}" = set; then
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$AWK"; then
+-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++  if test -n "$ac_ct_STRIP"; then
++  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ else
+   ac_save_IFS=$IFS; IFS=':'
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_AWK="$ac_prog"
++  test -f "$ac_dir/$ac_word" || continue
++ac_cv_prog_ac_ct_STRIP="strip"
+ break
+ done
+ 
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "configure:4035: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "configure:4038: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++fi
++
++enable_dlopen=no
++enable_win32_dll=no
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++
++fi;
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line 4060 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:4061: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo "configure:4081: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++if test "${lt_cv_cc_needs_belf+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++     ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++     cat >conftest.$ac_ext <<_ACEOF
++#line 4094 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:4106: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lt_cv_cc_needs_belf=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  lt_cv_cc_needs_belf=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++     ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='${CC-cc} -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++echo "configure:4121: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++need_locks="$enable_libtool_lock"
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++if test x"$host" != x"$build"; then
++  ac_tool_prefix=${host_alias}-
++else
++  ac_tool_prefix=
++fi
++
++# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
++case $host_os in
++linux-gnu*) ;;
++linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++esac
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++fi
++
++# Allow CC to be a program name with arguments.
++set dummy $CC
++compiler="$2"
++
++echo "configure:4214: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++echo "configure:4225: result: $objdir" >&5
++echo "${ECHO_T}$objdir" >&6
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi;
++test -z "$pic_mode" && pic_mode=default
++
++# We assume here that the value for lt_cv_prog_cc_pic will not be cached
++# in isolation, and that seeing it set (from the cache) indicates that
++# the associated values are set (in the cache) correctly too.
++echo "configure:4240: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++if test "${lt_cv_prog_cc_pic+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++   lt_cv_prog_cc_pic=
++  lt_cv_prog_cc_shlib=
++  lt_cv_prog_cc_wl=
++  lt_cv_prog_cc_static=
++  lt_cv_prog_cc_no_builtin=
++  lt_cv_prog_cc_can_build_shared=$can_build_shared
++
++  if test "$GCC" = yes; then
++    lt_cv_prog_cc_wl='-Wl,'
++    lt_cv_prog_cc_static='-static'
++
++    case $host_os in
++    aix*)
++      # Below there is a dirty hack to force normal static linking with -ldl
++      # The problem is because libdl dynamically linked with both libc and
++      # libC (AIX C++ library), which obviously doesn't included in libraries
++      # list by gcc. This cause undefined symbols with -static flags.
++      # This hack allows C programs to be linked with "-static -ldl", but
++      # we not sure about C++ programs.
++      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_cv_prog_cc_pic='-fno-common'
++      ;;
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	 lt_cv_prog_cc_pic=-Kconform_pic
++      fi
++      ;;
++    *)
++      lt_cv_prog_cc_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for PIC flags for the system compiler.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++        # AIX 5 now supports IA64 processor
++        lt_cv_prog_cc_static='-Bstatic'
++        lt_cv_prog_cc_wl='-Wl,'
++      else
++        lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
++      lt_cv_prog_cc_pic='+Z'
++      ;;
++
++    irix5* | irix6*)
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      # PIC (with -KPIC) is the default.
++      ;;
++
++    cygwin* | mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++      ;;
++
++    newsos6)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    osf3* | osf4* | osf5*)
++      # All OSF/1 code is PIC.
++      lt_cv_prog_cc_wl='-Wl,'
++      lt_cv_prog_cc_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_cv_prog_cc_pic='-Kpic'
++      lt_cv_prog_cc_static='-dn'
++      lt_cv_prog_cc_shlib='-belf'
++      ;;
++
++    solaris*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Wl,'
++      ;;
++
++    sunos4*)
++      lt_cv_prog_cc_pic='-PIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      lt_cv_prog_cc_wl='-Qoption ld '
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_cv_prog_cc_pic='-KPIC'
++      lt_cv_prog_cc_static='-Bstatic'
++      if test "x$host_vendor" = xsni; then
++        lt_cv_prog_cc_wl='-LD'
++      else
++        lt_cv_prog_cc_wl='-Wl,'
++      fi
++      ;;
++
++    uts4*)
++      lt_cv_prog_cc_pic='-pic'
++      lt_cv_prog_cc_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_cv_prog_cc_pic='-Kconform_pic'
++	lt_cv_prog_cc_static='-Bstatic'
++      fi
++      ;;
++
++    *)
++      lt_cv_prog_cc_can_build_shared=no
++      ;;
++    esac
++  fi
++
++fi
++
++if test -z "$lt_cv_prog_cc_pic"; then
++  echo "configure:4387: result: none" >&5
++echo "${ECHO_T}none" >&6
++else
++  echo "configure:4390: result: $lt_cv_prog_cc_pic" >&5
++echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
++
++  # Check to make sure the pic_flag actually works.
++  echo "configure:4394: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
++  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      save_CFLAGS="$CFLAGS"
++    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
++    cat >conftest.$ac_ext <<_ACEOF
++#line 4402 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:4414: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++        case $host_os in
++      hpux9* | hpux10* | hpux11*)
++	# On HP-UX, both CC and GCC only warn that PIC is supported... then
++	# they create non-PIC objects.  So, if there were any warnings, we
++	# assume that PIC is not supported.
++	if test -s conftest.err; then
++	  lt_cv_prog_cc_pic_works=no
++	else
++	  lt_cv_prog_cc_pic_works=yes
++	fi
++	;;
++      *)
++	lt_cv_prog_cc_pic_works=yes
++	;;
++      esac
++
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++        lt_cv_prog_cc_pic_works=no
++
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$save_CFLAGS"
++
+ fi
+-fi
+-AWK=$ac_cv_prog_AWK
+-if test -n "$AWK"; then
+-  echo "$as_me:2793: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
+-else
+-  echo "$as_me:2796: result: no" >&5
+-echo "${ECHO_T}no" >&6
++
++  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
++    lt_cv_prog_cc_pic=
++    lt_cv_prog_cc_can_build_shared=no
++  else
++    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  fi
++
++  echo "configure:4449: result: $lt_cv_prog_cc_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
+ fi
+ 
+-  test -n "$AWK" && break
+-done
++# Check for any special shared library compilation flags.
++if test -n "$lt_cv_prog_cc_shlib"; then
++  echo "configure: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2
++  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++   echo "configure: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
+ 
+-echo "$as_me:2803: checking for ln -s or something else" >&5
+-echo $ECHO_N "checking for ln -s or something else... $ECHO_C" >&6
+-if test "${ac_cv_prog_LN_S+set}" = set; then
++echo "configure:4463: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
++if test "${lt_cv_prog_cc_static_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  rm -f conftestdata
+-if ln -s X conftestdata 2>/dev/null
+-then
+-  rm -f conftestdata
+-  ac_cv_prog_LN_S="ln -s"
++    lt_cv_prog_cc_static_works=no
++  save_LDFLAGS="$LDFLAGS"
++  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4472 "configure"
++#include "confdefs.h"
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:4484: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lt_cv_prog_cc_static_works=yes
+ else
+-  touch conftestdata1
+-  if ln conftestdata1 conftestdata2; then
+-    rm -f conftestdata*
+-    ac_cv_prog_LN_S=ln
+-  else
+-    ac_cv_prog_LN_S=cp
+-  fi
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++  LDFLAGS="$save_LDFLAGS"
++
+ fi
+-LN_S="$ac_cv_prog_LN_S"
+-echo "$as_me:2824: result: $ac_cv_prog_LN_S" >&5
+-echo "${ECHO_T}$ac_cv_prog_LN_S" >&6
+ 
+-# Check whether --with-mips_abi or --without-mips_abi was given.
+-if test "${with_mips_abi+set}" = set; then
+-  withval="$with_mips_abi"
++# Belt *and* braces to stop my trousers falling down:
++test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
++echo "configure:4497: result: $lt_cv_prog_cc_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
++
++pic_flag="$lt_cv_prog_cc_pic"
++special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
++wl="$lt_cv_prog_cc_wl"
++link_static_flag="$lt_cv_prog_cc_static"
++no_builtin_flag="$lt_cv_prog_cc_no_builtin"
++can_build_shared="$lt_cv_prog_cc_can_build_shared"
++
++# Check to see if options -o and -c are simultaneously supported by compiler
++echo "configure:4508: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ 
+-fi;
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++echo "int some_variable = 0;" > conftest.$ac_ext
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
++compiler_c_o=no
++if { (eval echo configure:4528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++  if test -s out/conftest.err; then
++    lt_cv_compiler_c_o=no
++  else
++    lt_cv_compiler_c_o=yes
++  fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&5
++  lt_cv_compiler_c_o=no
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
+ 
+-case "$host_os" in
+-irix*)
+-with_mips_abi="${with_mips_abi:-yes}"
+-if test -n "$GCC"; then
++fi
+ 
+-# GCC < 2.8 only supports the O32 ABI. GCC >= 2.8 has a flag to select
+-# which ABI to use, but only supports (as of 2.8.1) the N32 and 64 ABIs.
+-#
+-# Default to N32, but if GCC doesn't grok -mabi=n32, we assume an old
+-# GCC and revert back to O32. The same goes if O32 is asked for - old
+-# GCCs doesn't like the -mabi option, and new GCCs can't output O32.
+-#
+-# Don't you just love *all* the different SGI ABIs?
++compiler_c_o=$lt_cv_compiler_c_o
++echo "configure:4552: result: $compiler_c_o" >&5
++echo "${ECHO_T}$compiler_c_o" >&6
+ 
+-case "${with_mips_abi}" in
+-        32|o32) abi='-mabi=32';  abilibdirext=''     ;;
+-       n32|yes) abi='-mabi=n32'; abilibdirext='32'  ;;
+-        64) abi='-mabi=64';  abilibdirext='64'   ;;
+-	no) abi=''; abilibdirext='';;
+-         *) { { echo "$as_me:2852: error: \"Invalid ABI specified\"" >&5
+-echo "$as_me: error: \"Invalid ABI specified\"" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
+-if test -n "$abi" ; then
+-ac_foo=krb_cv_gcc_`echo $abi | tr =- __`
+-echo "$as_me:2858: checking if $CC supports the $abi option" >&5
+-echo $ECHO_N "checking if $CC supports the $abi option... $ECHO_C" >&6
+-if eval "test \"\${$ac_foo+set}\" = set"; then
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  echo "configure:4557: checking if $compiler supports -c -o file.lo" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
++  if test "${lt_cv_compiler_o_lo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS $abi"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 2867 "configure"
++  lt_cv_compiler_o_lo=no
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4567 "configure"
+ #include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-int x;
++int some_variable = 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2879: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2882: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:2884: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2887: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  eval $ac_foo=yes
++if { (eval echo configure:4579: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++      # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      lt_cv_compiler_o_lo=no
++    else
++      lt_cv_compiler_o_lo=yes
++    fi
++
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval $ac_foo=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-CFLAGS="$save_CFLAGS"
++  CFLAGS="$save_CFLAGS"
+ 
+ fi
+ 
+-ac_res=`eval echo \\\$$ac_foo`
+-echo "$as_me:2901: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6
+-if test $ac_res = no; then
+-# Try to figure out why that failed...
+-case $abi in
+-	-mabi=32)
+-	save_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -mabi=n32"
+-	cat >conftest.$ac_ext <<_ACEOF
+-#line 2910 "configure"
++  compiler_o_lo=$lt_cv_compiler_o_lo
++  echo "configure:4598: result: $compiler_c_lo" >&5
++echo "${ECHO_T}$compiler_c_lo" >&6
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "configure:4608: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "configure:4616: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    echo "configure: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$GCC" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  echo "configure:4628: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++  echo "int some_variable = 0;" > conftest.$ac_ext
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
++  compiler_rtti_exceptions=no
++  cat >conftest.$ac_ext <<_ACEOF
++#line 4635 "configure"
+ #include "confdefs.h"
+ 
+ int
+ main ()
+ {
+-int x;
++int some_variable = 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:2922: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2925: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:2927: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:2930: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_res=yes
++if { (eval echo configure:4647: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++      # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++    if test -s conftest.err; then
++      compiler_rtti_exceptions=no
++    else
++      compiler_rtti_exceptions=yes
++    fi
++
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_res=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-	CLAGS="$save_CFLAGS"
+-	if test $ac_res = yes; then
+-		# New GCC
+-		{ { echo "$as_me:2942: error: $CC does not support the $with_mips_abi ABI" >&5
+-echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
+-   { (exit 1); exit 1; }; }
+-	fi
+-	# Old GCC
+-	abi=''
+-	abilibdirext=''
+-	;;
+-	-mabi=n32|-mabi=64)
+-		if test $with_mips_abi = yes; then
+-			# Old GCC, default to O32
+-			abi=''
+-			abilibdirext=''
+-		else
+-			# Some broken GCC
+-			{ { echo "$as_me:2957: error: $CC does not support the $with_mips_abi ABI" >&5
+-echo "$as_me: error: $CC does not support the $with_mips_abi ABI" >&2;}
+-   { (exit 1); exit 1; }; }
+-		fi
+-	;;
+-esac
+-fi #if test $ac_res = no; then
+-fi #if test -n "$abi" ; then
+-else
+-case "${with_mips_abi}" in
+-        32|o32) abi='-32'; abilibdirext=''     ;;
+-       n32|yes) abi='-n32'; abilibdirext='32'  ;;
+-        64) abi='-64'; abilibdirext='64'   ;;
+-	no) abi=''; abilibdirext='';;
+-         *) { { echo "$as_me:2971: error: \"Invalid ABI specified\"" >&5
+-echo "$as_me: error: \"Invalid ABI specified\"" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
+-fi #if test -n "$GCC"; then
+-;;
++  CFLAGS="$save_CFLAGS"
++  echo "configure:4662: result: $compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$compiler_rtti_exceptions" >&6
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++fi
++
++# See if the linker supports building shared libraries.
++echo "configure:4673: checking whether the linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++allow_undefined_flag=
++no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++archive_cmds=
++archive_expsym_cmds=
++old_archive_from_new_cmds=
++old_archive_from_expsyms_cmds=
++export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
++hardcode_into_libs=no
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++hardcode_shlibpath_var=unsupported
++runpath_var=
++link_all_deplibs=unknown
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
++extract_expsyms_cmds=
++
++case $host_os in
++cygwin* | mingw* | pw32* )
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$GCC" != yes; then
++    with_gnu_ld=no
++  fi
++  ;;
++
+ esac
+ 
+-CC="$CC $abi"
+-libdir="$libdir$abilibdirext"
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
++
++  # See if GNU ld supports shared libraries.
++  case $host_os in
++  aix3* | aix4* | aix5*)
++    # On AIX, the GNU linker is very broken
++    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
++    ld_shlibs=no
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-echo "$as_me:2982: checking for __attribute__" >&5
+-echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
+-if test "${ac_cv___attribute__+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
++      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
++      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
++      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
++      else $CC -o impgen impgen.c ; fi)~
++      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
++
++    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
++
++    # cygwin and mingw dlls have different entry points and sets of symbols
++    # to exclude.
++    # FIXME: what about values for MSVC?
++    dll_entry=__cygwin_dll_entry@12
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
++    case $host_os in
++    mingw*)
++      # mingw values
++      dll_entry=_DllMainCRTStartup@12
++      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++      ;;
++    esac
++
++    # mingw and cygwin differ, and it's simplest to just exclude the union
++    # of the two symbol sets.
++    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
++
++    # recent cygwin and mingw systems supply a stub DllMain which the user
++    # can override, but on older systems we have to supply one (in ltdll.c)
++    if test "x$lt_cv_need_dllmain" = "xyes"; then
++      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
++      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
++	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
++    else
++      ltdll_obj=
++      ltdll_cmds=
++    fi
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left be newer dlltools.
++    export_symbols_cmds="$ltdll_cmds"'
++      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
++
++    # If the export-symbols file already is a .def file (1st line
++    # is EXPORTS), use it as is.
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++        cp $export_symbols $output_objdir/$soname-def;
++      else
++        echo EXPORTS > $output_objdir/$soname-def;
++        _lt_hint=1;
++        cat $export_symbols | while read symbol; do
++         set dummy \$symbol;
++         case \$# in
++           2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
++           *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
++         esac;
++         _lt_hint=`expr 1 + \$_lt_hint`;
++        done;
++      fi~
++      '"$ltdll_cmds"'
++      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
++      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
++      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++      wlarc=
++    else
++      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
++
++  if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw* | pw32*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++	whole_archive_flag_spec=
++      fi
++      ;;
++    esac
++  fi
+ else
++  # PORTME fill in a description of your system's linker (not GNU ld)
++  case $host_os in
++  aix3*)
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++    # Note: this linker hardcodes the directories in LIBPATH if there
++    # are no directories specified by -L.
++    hardcode_minus_L=yes
++    if test "$GCC" = yes && test -z "$link_static_flag"; then
++      # Neither direct hardcoding nor static linking is supported with a
++      # broken collect2.
++      hardcode_direct=unsupported
++    fi
++    ;;
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 2989 "configure"
+-#include "confdefs.h"
++  aix4* | aix5*)
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    archive_cmds=''
++    hardcode_libdir_separator=':'
++    if test "$GCC" = yes; then
++      collect2name=`${CC} -print-prog-name=collect2`
++      if test -f "$collect2name" && \
++	 strings "$collect2name" | grep resolve_lib_name >/dev/null
++      then
++	# We have reworked collect2
++	hardcode_direct=yes
++      else
++        # We have old collect2
++        hardcode_direct=unsupported
++        # It fails to find uninstalled libraries when the uninstalled
++        # path is not listed in the libpath.  Setting hardcode_minus_L
++        # to unsupported forces relinking
++        hardcode_minus_L=yes
++        hardcode_libdir_flag_spec='-L$libdir'
++        hardcode_libdir_separator=
++      fi
++      shared_flag='-shared'
++    else
++      if test "$host_cpu" = ia64; then
++        shared_flag='-G'
++      else
++        shared_flag='${wl}-bM:SRE'
++      fi
++      hardcode_direct=yes
++    fi
+ 
+-#include <stdlib.h>
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      # Test if we are trying to use run time linking, or normal AIX style linking.
++      # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
++      aix_use_runtimelinking=no
++      for ld_flag in $LDFLAGS; do
++        if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
++          aix_use_runtimelinking=yes
++          break
++        fi
++      done
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++    # It seems that -bexpall can do strange things, so it is better to
++    # generate a list of symbols to export.
++    always_export_symbols=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++      allow_undefined_flag=' -Wl,-G'
++      archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++    else
++      if test "$host_cpu" = ia64; then
++        hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++       allow_undefined_flag="-znodefs"
++        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++        hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++        # Warning - without using the other run time loading flags, -berok will
++        #           link without error, but may produce a broken library.
++        allow_undefined_flag='${wl}-berok"
++        # This is a bit strange, but is similar to how AIX traditionally builds
++        # it's shared libraries.
++        archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
++      fi
++    fi
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++    fix_srcfile_path='`cygpath -w "$srcfile"`'
++    ;;
++
++  darwin* | rhapsody*)
++    allow_undefined_flag='-undefined suppress'
++    # FIXME: Relying on posixy $() will cause problems for
++    #        cross-compilation, but unfortunately the echo tests do not
++    #        yet detect zsh echo's removal of \ escapes.
++    archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
++    ;;
++
++  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++  # support.  Future versions do this automatically, but an explicit c++rt0.o
++  # does not break anything, and helps significantly (at the cost of a little
++  # extra space).
++  freebsd2.2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++  freebsd2*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  hpux9* | hpux10* | hpux11*)
++    case $host_os in
++    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
++    esac
++    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_direct=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
++    export_dynamic_flag_spec='${wl}-E'
++    ;;
++
++  irix5* | irix6*)
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    link_all_deplibs=yes
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    fi
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  newsos6)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    hardcode_shlibpath_var=no
++    ;;
++
++  openbsd*)
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  os2*)
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++    allow_undefined_flag=unsupported
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++    ;;
++
++  osf3*)
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++
++  osf4* | osf5*)	# as osf3* with the addition of -msym flag
++    if test "$GCC" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++      #Both c and cxx compiler support -rpath directly
++      hardcode_libdir_flag_spec='-rpath $libdir'
++    fi
++    hardcode_libdir_separator=:
++    ;;
++
++  sco3.2v5*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
++    ;;
+ 
+-int
+-main ()
+-{
++  solaris*)
++    no_undefined_flag=' -z defs'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec='-R$libdir'
++    hardcode_shlibpath_var=no
++    case $host_os in
++    solaris2.[0-5] | solaris2.[0-5].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++    esac
++    link_all_deplibs=yes
++    ;;
+ 
+-static void foo(void) __attribute__ ((noreturn));
++  sunos4*)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++    fi
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_direct=yes
++    hardcode_minus_L=yes
++    hardcode_shlibpath_var=no
++    ;;
+ 
+-static void
+-foo(void)
+-{
+-  exit(1);
+-}
++  sysv4)
++    if test "x$host_vendor" = xsno; then
++      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
++      hardcode_direct=yes # is this really true???
++    else
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    ;;
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:3011: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:3014: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:3016: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:3019: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  ac_cv___attribute__=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv___attribute__=no
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-fi
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
+ 
+-if test "$ac_cv___attribute__" = "yes"; then
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
+ 
+-cat >>confdefs.h <<\EOF
+-#define HAVE___ATTRIBUTE__ 1
+-EOF
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
+ 
+-fi
+-echo "$as_me:3037: result: $ac_cv___attribute__" >&5
+-echo "${ECHO_T}$ac_cv___attribute__" >&6
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
+ 
+-# Check whether --enable-shared or --disable-shared was given.
+-if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_shared=no
+-fi;
+-# Check whether --enable-static or --disable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_static=yes
+-fi;
+-# Check whether --enable-fast-install or --disable-fast-install was given.
+-if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
+     fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_fast_install=yes
+-fi;
++    ;;
+ 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
+-else
+-  with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$ac_cv_c_compiler_gnu" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:3117: checking for ld used by GCC" >&5
+-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case "$ac_prog" in
+-    # Accept absolute paths.
+-    [\\/]* | [A-Za-z]:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  sysv5uw7* | unixware7*)
++    no_undefined_flag='${wl}-z ${wl}text'
++    if test "$GCC" = yes; then
++      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    else
++      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
+     ;;
++
+   *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
++    ld_shlibs=no
+     ;;
+   esac
+-elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:3147: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+-else
+-  echo "$as_me:3150: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ fi
+-if test "${ac_cv_path_LD+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      ac_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+-	test "$with_gnu_ld" != no && break
+-      else
+-	test "$with_gnu_ld" != yes && break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
++echo "configure:5285: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++# Check hardcoding attributes.
++echo "configure:5290: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var"; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
+ else
+-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
+-fi
+-
+-LD="$ac_cv_path_LD"
+-if test -n "$LD"; then
+-  echo "$as_me:3180: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "configure:5314: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6
++
++striplib=
++old_striplib=
++echo "configure:5319: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "configure:5324: result: yes" >&5
++echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:3183: result: no" >&5
++  echo "configure:5327: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+-test -z "$LD" && { { echo "$as_me:3186: error: no acceptable ld found in \$PATH" >&5
+-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
+-echo "$as_me:3189: checking if the linker ($LD) is GNU ld" >&5
+-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+-if test "${ac_cv_prog_gnu_ld+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  ac_cv_prog_gnu_ld=yes
+-else
+-  ac_cv_prog_gnu_ld=no
+-fi
+-fi
+-echo "$as_me:3201: result: $ac_cv_prog_gnu_ld" >&5
+-echo "${ECHO_T}$ac_cv_prog_gnu_ld" >&6
+-with_gnu_ld=$ac_cv_prog_gnu_ld
+ 
+-echo "$as_me:3205: checking for $LD option to reload object files" >&5
+-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
+-if test "${lt_cv_ld_reload_flag+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_ld_reload_flag='-r'
+-fi
+-echo "$as_me:3212: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ 
+-echo "$as_me:3217: checking for BSD-compatible nm" >&5
+-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+-if test "${ac_cv_path_NM+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$NM"; then
+-  # Let the user override the test.
+-  ac_cv_path_NM="$NM"
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -B"
+-	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$tmp_nm -p"
+-	break
++# PORTME Fill in your ld.so characteristics
++echo "configure:5335: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++       aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++           echo ' yes '
++           echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++        :
+       else
+-	ac_cv_path_NM=${ac_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
++        can_build_shared=no
+       fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
++      # lib<name>.a to let people know that these are not typical AIX shared libraries.
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}.so$major'
+     fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+-fi
+-fi
+-
+-NM="$ac_cv_path_NM"
+-echo "$as_me:3252: result: $NM" >&5
+-echo "${ECHO_T}$NM" >&6
+-
+-echo "$as_me:3255: checking whether ln -s works" >&5
+-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+-LN_S=$as_ln_s
+-if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:3259: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "$as_me:3262: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
+-fi
+-
+-echo "$as_me:3266: checking how to recognise dependant libraries" >&5
+-echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  lt_cv_file_magic_cmd='${MAGIC}'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [regex]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++    shlibpath_var=LIBPATH
++    deplibs_check_method=pass_all
++  fi
++  ;;
+ 
+-case "$host_os" in
+-aix4*)
+-  lt_cv_deplibs_check_method=pass_all
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+   ;;
+ 
+ beos*)
+-  lt_cv_deplibs_check_method=pass_all
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+ bsdi4*)
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-    lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
+   ;;
+ 
+-cygwin* | mingw*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='${OBJDUMP} -f'
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  case $GCC,$host_os in
++  yes,cygwin*)
++    library_names_spec='$libname.dll.a'
++    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog .libs/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    ;;
++  yes,mingw*)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
++    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
++    ;;
++  yes,pw32*)
++    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
++    ;;
++  *)
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
+   ;;
+ 
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case "$host_cpu" in
+-    i*86 )
+-            lt_cv_deplibs_check_method=='file_magic OpenBSD/i[3-9]86 demand paged shared library'
+-            lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  # FIXME: Relying on posixy $() will cause problems for
++  #        cross-compilation, but unfortunately the echo tests do not
++  #        yet detect zsh echo's removal of \ escapes.
++  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
+       ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
++    freebsd-*)
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *)
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
+   ;;
+ 
+ gnu*)
+-  lt_cv_deplibs_check_method=pass_all
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
+   ;;
+ 
+-hpux10.20*)
+-  # TODO:  Does this work for hpux-11 too?
+-  lt_cv_deplibs_check_method='file_magic (s0-90-90-9|PA-RISC0-9.0-9) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  dynamic_linker="$host_os dld.sl"
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  shlibpath_var=SHLIB_PATH
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
+ irix5* | irix6*)
+-  case "$host_os" in
++  version_type=irix
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  case $host_os in
+   irix5*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    libsuff= shlibsuff=
+     ;;
+   *)
+-    case "$LD" in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
+     esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-        lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+-        ;;
++    ;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  dynamic_linker=no
+   ;;
+ 
+ # This must be Linux ELF.
+ linux-gnu*)
+-  case "$host_cpu" in
+-  alpha* | i*86 | powerpc* | sparc* | ia64* )
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+-      esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+ netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then :
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+-        lt_cv_file_magic_cmd='/usr/bin/file -L'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++    need_version=no
+   fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++os2*)
++  libname_spec='$name'
++  need_lib_prefix=no
++  library_names_spec='$libname.dll $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
++  version_type=osf
++  need_version=no
++  soname_spec='${libname}${release}.so'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+ sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
++  version_type=osf
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case "$host_vendor" in
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  motorola)
+-        lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
+   esac
+   ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
+ esac
++echo "configure:5717: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++# Report the final consequences.
++echo "configure:5722: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "configure:5724: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  *)
++
++echo "configure:5763: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 5771 "configure"
++#include "confdefs.h"
+ 
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5790: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_dl_dlopen=no
+ fi
+-echo "$as_me:3402: result: $lt_cv_deplibs_check_method" >&5
+-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:5800: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "configure:5805: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5811 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++char (*f) ();
+ 
+-# Only perform the check for file, if the check method requires it
+-case "$deplibs_check_method" in
+-file_magic*)
+-  if test "$file_magic_cmd" = '${MAGIC}'; then
+-    echo "$as_me:3411: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC+set}" = set; then
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++f = dlopen;
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5842: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_func_dlopen=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_dlopen=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++fi
++echo "configure:5851: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "configure:5856: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/${ac_tool_prefix}file; then
+-      lt_cv_path_MAGIC="$ac_dir/${ac_tool_prefix}file"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++  cat >conftest.$ac_ext <<_ACEOF
++#line 5862 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++char (*f) ();
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
++int
++main ()
++{
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++f = shl_load;
++#endif
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5893: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_func_shl_load=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_shl_load=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++fi
++echo "configure:5902: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++
++echo "configure:5908: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 5916 "configure"
++#include "confdefs.h"
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5935: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_svld_dlopen=no
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:5945: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++
++echo "configure:5951: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line 5959 "configure"
++#include "confdefs.h"
+ 
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  echo "$as_me:3466: result: $MAGIC" >&5
+-echo "${ECHO_T}$MAGIC" >&6
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:5978: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  ac_cv_lib_dld_shl_load=yes
+ else
+-  echo "$as_me:3469: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "configure:5988: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+ fi
+ 
+-if test -z "$lt_cv_path_MAGIC"; then
+-  if test -n "$ac_tool_prefix"; then
+-    echo "$as_me:3475: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  case "$MAGIC" in
+-  /*)
+-  lt_cv_path_MAGIC="$MAGIC" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  ac_cv_path_MAGIC="$MAGIC" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC="$MAGIC"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/file; then
+-      lt_cv_path_MAGIC="$ac_dir/file"
+-      if test -n "$file_magic_test_file"; then
+-	case "$deplibs_check_method" in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC="$lt_cv_path_MAGIC"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++	
++fi
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
++fi
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC="$ac_save_MAGIC"
+-  ;;
+-esac
+ fi
+ 
+-MAGIC="$lt_cv_path_MAGIC"
+-if test -n "$MAGIC"; then
+-  echo "$as_me:3530: result: $MAGIC" >&5
+-echo "${ECHO_T}$MAGIC" >&6
+-else
+-  echo "$as_me:3533: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ fi
+ 
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
+   else
+-    MAGIC=:
++    enable_dlopen=no
+   fi
+-fi
+ 
+-  fi
+-  ;;
+-esac
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:3549: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "configure:6023: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
+ else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-break
+-done
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 6034 "configure"
++#include "confdefs.h"
+ 
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo configure:6095: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
+ fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "$as_me:3571: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
+-else
+-  echo "$as_me:3574: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++rm -fr conftest*
+ 
+ fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+-  ac_ct_RANLIB=$RANLIB
+-  # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo "$as_me:3583: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++echo "configure:6111: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "configure:6116: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -n "$ac_ct_RANLIB"; then
+-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
+ else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_RANLIB="ranlib"
+-break
+-done
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 6127 "configure"
++#include "confdefs.h"
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo configure:6188: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
+ fi
++rm -fr conftest*
++
+ fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:3606: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+-  echo "$as_me:3609: result: no" >&5
+-echo "${ECHO_T}no" >&6
++echo "configure:6204: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
+-else
+-  RANLIB="$ac_cv_prog_RANLIB"
++if test "$enable_shared" = yes && test "$GCC" = yes; then
++  case $archive_cmds in
++  *'~'*)
++    # FIXME: we may have to deal with multi-command sequences.
++    ;;
++  '$CC '*)
++    # Test whether the compiler implicitly links with -lc since on some
++    # systems, -lgcc has to come before -lc. If gcc already passes -lc
++    # to ld, don't add -lc before -lgcc.
++    echo "configure:6234: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  $rm conftest*
++    echo 'static int dummy;' > conftest.$ac_ext
++
++    if { (eval echo configure:6242: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; }; then
++      soname=conftest
++      lib=conftest
++      libobjs=conftest.$ac_objext
++      deplibs=
++      wl=$lt_cv_prog_cc_wl
++      compiler_flags=-v
++      linker_flags=-v
++      verstring=
++      output_objdir=.
++      libname=conftest
++      save_allow_undefined_flag=$allow_undefined_flag
++      allow_undefined_flag=
++      if { (eval echo configure:6255: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") >&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
++      then
++	lt_cv_archive_cmds_need_lc=no
++      else
++	lt_cv_archive_cmds_need_lc=yes
++      fi
++      allow_undefined_flag=$save_allow_undefined_flag
++    else
++      cat conftest.err 1>&5
++    fi
+ fi
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:3621: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++    echo "configure:6267: result: $lt_cv_archive_cmds_need_lc" >&5
++echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
++    ;;
++  esac
++fi
++need_lc=${lt_cv_archive_cmds_need_lc-yes}
++
++# The second clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  :
+ else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-break
+-done
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  test -f Makefile && make "$ltmain"
++fi
++
++if test -f "$ltmain"; then
++  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
++  $rm -f "${ofile}T"
++
++  echo creating $ofile
++
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS \
++    AR AR_FLAGS CC LD LN_S NM SHELL \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
++    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
++    old_striplib striplib file_magic_cmd export_symbols_cmds \
++    deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case $var in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  cat <<__EOF__ > "${ofile}T"
++#! $SHELL
++
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="sed -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$need_lc
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# The default C compiler.
++CC=$lt_CC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_pic_flag
++pic_mode=$pic_mode
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$lt_compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_link_static_flag
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
+ 
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  echo "$as_me:3643: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
+-else
+-  echo "$as_me:3646: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+ 
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-echo "$as_me:3655: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-  ac_save_IFS=$IFS; IFS=':'
+-ac_dummy="$PATH"
+-for ac_dir in $ac_dummy; do
+-  IFS=$ac_save_IFS
+-  test -z "$ac_dir" && ac_dir=.
+-  $as_executable_p "$ac_dir/$ac_word" || continue
+-ac_cv_prog_ac_ct_STRIP="strip"
+-break
+-done
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:3678: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
+-else
+-  echo "$as_me:3681: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
+ 
+-  STRIP=$ac_ct_STRIP
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
+ 
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags="--cache-file=$cache_file"
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_c_compiler_gnu" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-fi;
+-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
+ 
+-# Check whether --with-pic or --without-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
+-else
+-  pic_mode=default
+-fi;
+-test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic"
+-test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$host" in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '#line 3721 "configure"' > conftest.$ac_ext
+-  if { (eval echo "$as_me:3722: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:3725: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:3746: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+-if test "${lt_cv_cc_needs_belf+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
+ 
+-     ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
+ 
+-     cat >conftest.$ac_ext <<_ACEOF
+-#line 3759 "configure"
+-#include "confdefs.h"
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
+ 
+-int
+-main ()
+-{
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:3771: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:3774: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:3776: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:3779: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  lt_cv_cc_needs_belf=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-lt_cv_cc_needs_belf=no
+-fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
+-     ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
+ 
+-fi
+-echo "$as_me:3795: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
+ 
+-esac
++# ### END LIBTOOL CONFIG
+ 
+-# Save cache, so that ltconfig can load it
+-cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
+-#
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
+-#
+-# `ac_cv_env_foo' variables (set or unset) will be overriden when
+-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+-# following values.
++__EOF__
+ 
+-_ACEOF
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "${ofile}T"
+ 
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-{
+-  (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+-      sed -n \
+-        "s/'/'\\\\''/g;
+-    	  s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
+-    *)
+-      # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-        "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+-      ;;
+-    esac;
+-} |
+-  sed '
+-     t clear
+-     : clear
+-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+-     t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if cmp -s $cache_file confcache; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+-    cat confcache >$cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
+ fi
+-rm -f confcache
++EOF
++    ;;
++  esac
++
++  case $host_os in
++  cygwin* | mingw* | pw32* | os2*)
++    cat <<'EOF' >> "${ofile}T"
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++        # This is a source program that is used to create import libraries
++        # on Windows for dlls which lack them. Don't remove nor modify the
++        # starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
++#
++#  This file is part of GNU libtool.
++#
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++#
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++#
++# #include <stdio.h>		/* for printf() */
++# #include <unistd.h>		/* for open(), lseek(), read() */
++# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++# #include <string.h>		/* for strdup() */
++#
++# /* O_BINARY isn't required (or even defined sometimes) under Unix */
++# #ifndef O_BINARY
++# #define O_BINARY 0
++# #endif
++#
++# static unsigned int
++# pe_get16 (fd, offset)
++#      int fd;
++#      int offset;
++# {
++#   unsigned char b[2];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 2);
++#   return b[0] + (b[1]<<8);
++# }
++#
++# static unsigned int
++# pe_get32 (fd, offset)
++#     int fd;
++#     int offset;
++# {
++#   unsigned char b[4];
++#   lseek (fd, offset, SEEK_SET);
++#   read (fd, b, 4);
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# static unsigned int
++# pe_as32 (ptr)
++#      void *ptr;
++# {
++#   unsigned char *b = ptr;
++#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++# }
++#
++# int
++# main (argc, argv)
++#     int argc;
++#     char *argv[];
++# {
++#     int dll;
++#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#     unsigned long export_rva, export_size, nsections, secptr, expptr;
++#     unsigned long name_rvas, nexp;
++#     unsigned char *expdata, *erva;
++#     char *filename, *dll_name;
++#
++#     filename = argv[1];
++#
++#     dll = open(filename, O_RDONLY|O_BINARY);
++#     if (dll < 1)
++# 	return 1;
++#
++#     dll_name = filename;
++#
++#     for (i=0; filename[i]; i++)
++# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++# 	    dll_name = filename + i +1;
++#
++#     pe_header_offset = pe_get32 (dll, 0x3c);
++#     opthdr_ofs = pe_header_offset + 4 + 20;
++#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
++#
++#     if (num_entries < 1) /* no exports */
++# 	return 1;
++#
++#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#     export_size = pe_get32 (dll, opthdr_ofs + 100);
++#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#     secptr = (pe_header_offset + 4 + 20 +
++# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
++#
++#     expptr = 0;
++#     for (i = 0; i < nsections; i++)
++#     {
++# 	char sname[8];
++# 	unsigned long secptr1 = secptr + 40 * i;
++# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++# 	lseek(dll, secptr1, SEEK_SET);
++# 	read(dll, sname, 8);
++# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++# 	{
++# 	    expptr = fptr + (export_rva - vaddr);
++# 	    if (export_rva + export_size > vaddr + vsize)
++# 		export_size = vsize - (export_rva - vaddr);
++# 	    break;
++# 	}
++#     }
++#
++#     expdata = (unsigned char*)malloc(export_size);
++#     lseek (dll, expptr, SEEK_SET);
++#     read (dll, expdata, export_size);
++#     erva = expdata - export_rva;
++#
++#     nexp = pe_as32 (expdata+24);
++#     name_rvas = pe_as32 (expdata+32);
++#
++#     printf ("EXPORTS\n");
++#     for (i = 0; i<nexp; i++)
++#     {
++# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#     }
++#
++#     return 0;
++# }
++# /* impgen.c ends here */
+ 
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \
+-|| { { echo "$as_me:3870: error: libtool configure failed" >&5
+-echo "$as_me: error: libtool configure failed" >&2;}
+-   { (exit 1); exit 1; }; }
++EOF
++    ;;
++  esac
+ 
+-# Reload cache, that may have been modified by ltconfig
+-if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
+-    { echo "$as_me:3879: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
+-    case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
+-    esac
+-  fi
+-else
+-  { echo "$as_me:3887: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
+-  >$cache_file
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
++  mv -f "${ofile}T" "$ofile" || \
++    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  chmod +x "$ofile"
+ fi
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+-# Redirect the config.log output again, so that the ltconfig log is not
+-# clobbered by the next message.
+-exec 5>>./config.log
++# Prevent multiple expansion
+ 
+ WFLAGS_NOUNUSED=""
+ WFLAGS_NOIMPLICITINT=""
+@@ -3931,25 +6857,21 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:3934: checking for $ac_header" >&5
++
++echo "configure:6861: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 3940 "configure"
++#line 6867 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:3944: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:3950: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:6873: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -3957,16 +6879,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:3969: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:6894: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -3978,7 +6903,7 @@
+ 
+ fi
+ 
+-echo "$as_me:3981: checking for dbopen" >&5
++echo "configure:6906: checking for dbopen" >&5
+ echo $ECHO_N "checking for dbopen... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dbopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -3994,7 +6919,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 3997 "configure"
++#line 6922 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -4013,20 +6938,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4016: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4019: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4021: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4024: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:6941: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbopen=$ac_lib; else ac_cv_funclib_dbopen=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -4039,17 +6955,17 @@
+ eval "ac_res=\$ac_cv_funclib_dbopen"
+ 
+ if false; then
+-
++	
+ for ac_func in dbopen
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:4046: checking for $ac_func" >&5
++echo "configure:6962: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4052 "configure"
++#line 6968 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4080,25 +6996,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4083: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4086: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4088: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4091: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:6999: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:4101: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7008: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4122,13 +7029,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:4125: result: yes" >&5
++	echo "configure:7032: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dbopen=no"
+ 	eval "LIB_dbopen="
+-	echo "$as_me:4131: result: no" >&5
++	echo "configure:7038: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -4142,12 +7049,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:4145: result: yes, in $ac_res" >&5
++	echo "configure:7052: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:4150: checking for dbm_firstkey" >&5
++echo "configure:7057: checking for dbm_firstkey" >&5
+ echo $ECHO_N "checking for dbm_firstkey... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dbm_firstkey+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4163,7 +7070,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 4166 "configure"
++#line 7073 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4175,20 +7082,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4178: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4181: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4183: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4186: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7085: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dbm_firstkey=$ac_lib; else ac_cv_funclib_dbm_firstkey=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -4201,17 +7099,17 @@
+ eval "ac_res=\$ac_cv_funclib_dbm_firstkey"
+ 
+ if false; then
+-
++	
+ for ac_func in dbm_firstkey
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:4208: checking for $ac_func" >&5
++echo "configure:7106: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4214 "configure"
++#line 7112 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4242,25 +7140,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4245: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4248: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4250: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4253: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7143: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:4263: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7152: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4284,13 +7173,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:4287: result: yes" >&5
++	echo "configure:7176: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dbm_firstkey=no"
+ 	eval "LIB_dbm_firstkey="
+-	echo "$as_me:4293: result: no" >&5
++	echo "configure:7182: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -4304,12 +7193,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:4307: result: yes, in $ac_res" >&5
++	echo "configure:7196: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:4312: checking for db_create" >&5
++echo "configure:7201: checking for db_create" >&5
+ echo $ECHO_N "checking for db_create... $ECHO_C" >&6
+ if test "${ac_cv_funclib_db_create+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4325,7 +7214,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 4328 "configure"
++#line 7217 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4337,20 +7226,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4340: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4343: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4345: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4348: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7229: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_db_create=$ac_lib; else ac_cv_funclib_db_create=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -4363,17 +7243,17 @@
+ eval "ac_res=\$ac_cv_funclib_db_create"
+ 
+ if false; then
+-
++	
+ for ac_func in db_create
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:4370: checking for $ac_func" >&5
++echo "configure:7250: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4376 "configure"
++#line 7256 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -4404,25 +7284,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:4407: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4410: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4412: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4415: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7287: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:4425: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:7296: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -4446,13 +7317,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:4449: result: yes" >&5
++	echo "configure:7320: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_db_create=no"
+ 	eval "LIB_db_create="
+-	echo "$as_me:4455: result: no" >&5
++	echo "configure:7326: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -4466,7 +7337,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:4469: result: yes, in $ac_res" >&5
++	echo "configure:7340: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -4479,7 +7350,7 @@
+ 	DBLIB="$DBLIB $LIB_dbm_firstkey"
+ fi
+ 
+-echo "$as_me:4482: checking for inline" >&5
++echo "configure:7353: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4487,7 +7358,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4490 "configure"
++#line 7361 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ $ac_kw int foo () {return 0; }
+@@ -4495,26 +7366,17 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4498: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4501: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4503: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4506: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7369: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+-echo "$as_me:4517: result: $ac_cv_c_inline" >&5
++echo "configure:7379: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -4529,13 +7391,13 @@
+  ;;
+ esac
+ 
+-echo "$as_me:4532: checking for an ANSI C-conforming const" >&5
++echo "configure:7394: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4538 "configure"
++#line 7400 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -4593,25 +7455,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4596: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4599: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4601: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4604: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7458: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_c_const=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_c_const=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4614: result: $ac_cv_c_const" >&5
++echo "configure:7467: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -4621,13 +7474,13 @@
+ 
+ fi
+ 
+-echo "$as_me:4624: checking for ANSI C header files" >&5
++echo "configure:7477: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4630 "configure"
++#line 7483 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -4635,15 +7488,9 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:4638: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:4644: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:7492: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -4651,19 +7498,21 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4666 "configure"
++#line 7515 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -4681,7 +7530,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4684 "configure"
++#line 7533 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -4702,7 +7551,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4705 "configure"
++#line 7554 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -4728,27 +7577,20 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:4731: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4734: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:4735: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4738: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7580: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_header_stdc=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_header_stdc=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+ fi
+ fi
+-echo "$as_me:4751: result: $ac_cv_header_stdc" >&5
++echo "configure:7593: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -4758,61 +7600,13 @@
+ 
+ fi
+ 
+-for ac_header in stdlib.h string.h memory.h strings.h inttypes.h unistd.h
+-do
+-ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:4764: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line 4770 "configure"
+-#include "confdefs.h"
+-#include <$ac_header>
+-_ACEOF
+-if { (eval echo "$as_me:4774: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:4780: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+-  eval "$ac_ac_Header=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  eval "$ac_ac_Header=no"
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-fi
+-echo "$as_me:4799: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+-if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<EOF
+-#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
+-EOF
+-
+-fi
+-done
+-
+-echo "$as_me:4809: checking for size_t" >&5
++echo "configure:7603: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4815 "configure"
++#line 7609 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4827,25 +7621,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4830: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4833: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4835: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4838: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7624: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_size_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_size_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4848: result: $ac_cv_type_size_t" >&5
++echo "configure:7633: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -4857,13 +7642,13 @@
+ 
+ fi
+ 
+-echo "$as_me:4860: checking for pid_t" >&5
++echo "configure:7645: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4866 "configure"
++#line 7651 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -4878,25 +7663,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4881: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4884: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4886: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4889: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7666: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_pid_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_pid_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4899: result: $ac_cv_type_pid_t" >&5
++echo "configure:7675: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -4908,13 +7684,13 @@
+ 
+ fi
+ 
+-echo "$as_me:4911: checking for uid_t in sys/types.h" >&5
++echo "configure:7687: checking for uid_t in sys/types.h" >&5
+ echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4917 "configure"
++#line 7693 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -4928,7 +7704,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:4931: result: $ac_cv_type_uid_t" >&5
++echo "configure:7707: result: $ac_cv_type_uid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+ if test $ac_cv_type_uid_t = no; then
+ 
+@@ -4942,13 +7718,13 @@
+ 
+ fi
+ 
+-echo "$as_me:4945: checking return type of signal handlers" >&5
++echo "configure:7721: checking return type of signal handlers" >&5
+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
+ if test "${ac_cv_type_signal+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 4951 "configure"
++#line 7727 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -4970,25 +7746,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:4973: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4976: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:4978: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:4981: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7749: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_signal=void
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_signal=int
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_signal=int
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:4991: result: $ac_cv_type_signal" >&5
++echo "configure:7758: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+ 
+ cat >>confdefs.h <<EOF
+@@ -4996,20 +7763,20 @@
+ EOF
+ 
+ if test "$ac_cv_type_signal" = "void" ; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define VOID_RETSIGTYPE 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:5006: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:7773: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5012 "configure"
++#line 7779 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -5024,25 +7791,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5027: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5030: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5032: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5035: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:7794: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_header_time=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_header_time=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:5045: result: $ac_cv_header_time" >&5
++echo "configure:7803: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -5055,25 +7813,21 @@
+ for ac_header in standards.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:5058: checking for $ac_header" >&5
++
++echo "configure:7817: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5064 "configure"
++#line 7823 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:5068: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:5074: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:7829: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -5081,16 +7835,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:5093: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:7850: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5104,13 +7861,13 @@
+ 
+ cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-echo "$as_me:5107: checking for $i" >&5
++echo "configure:7864: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5113 "configure"
++#line 7870 "configure"
+ #include "confdefs.h"
+ \
+ #ifdef HAVE_STANDARDS_H
+@@ -5119,15 +7876,9 @@
+ #include <$i>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:5122: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:5128: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:7880: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -5135,16 +7886,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "ac_cv_header_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_header_$cv=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:5147: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "configure:7901: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
+ ac_res=`eval echo \\$ac_cv_header_$cv`
+ if test "$ac_res" = yes; then
+@@ -5156,29 +7910,26 @@
+ fi
+ done
+ if false;then
++	
+ 
+ for ac_header in netinet/ip.h netinet/tcp.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:5163: checking for $ac_header" >&5
++
++echo "configure:7919: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5169 "configure"
++#line 7925 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:5173: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:5179: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:7931: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -5186,16 +7937,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:5198: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:7952: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5210,13 +7964,13 @@
+ for ac_func in getlogin setlogin
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:5213: checking for $ac_func" >&5
++echo "configure:7967: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5219 "configure"
++#line 7973 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5247,25 +8001,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5250: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5253: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5255: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5258: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8004: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5268: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:8013: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5276,7 +8021,7 @@
+ done
+ 
+ if test "$ac_cv_func_getlogin" = yes; then
+-echo "$as_me:5279: checking if getlogin is posix" >&5
++echo "configure:8024: checking if getlogin is posix" >&5
+ echo $ECHO_N "checking if getlogin is posix... $ECHO_C" >&6
+ if test "${ac_cv_func_getlogin_posix+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5289,10 +8034,10 @@
+ fi
+ 
+ fi
+-echo "$as_me:5292: result: $ac_cv_func_getlogin_posix" >&5
++echo "configure:8037: result: $ac_cv_func_getlogin_posix" >&5
+ echo "${ECHO_T}$ac_cv_func_getlogin_posix" >&6
+ if test "$ac_cv_func_getlogin_posix" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define POSIX_GETLOGIN 1
+ EOF
+@@ -5300,7 +8045,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:5303: checking if realloc if broken" >&5
++echo "configure:8048: checking if realloc if broken" >&5
+ echo $ECHO_N "checking if realloc if broken... $ECHO_C" >&6
+ if test "${ac_cv_func_realloc_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5311,7 +8056,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5314 "configure"
++#line 8059 "configure"
+ #include "confdefs.h"
+ 
+ #include <stddef.h>
+@@ -5324,30 +8069,22 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:5327: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5330: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:5331: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5334: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8072: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_realloc_broken=yes
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_realloc_broken=yes
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ fi
+-echo "$as_me:5347: result: $ac_cv_func_realloc_broken" >&5
++echo "configure:8084: result: $ac_cv_func_realloc_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_realloc_broken" >&6
+ if test "$ac_cv_func_realloc_broken" = yes ; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define BROKEN_REALLOC 1
+ EOF
+@@ -5371,13 +8108,13 @@
+   WFLAGS_NOIMPLICITINT="-Wno-implicit-int"
+ fi
+ 
+-echo "$as_me:5374: checking for ssize_t" >&5
++echo "configure:8111: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5380 "configure"
++#line 8117 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -5395,7 +8132,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:5398: result: $ac_cv_type_ssize_t" >&5
++echo "configure:8135: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = no; then
+ 
+@@ -5406,13 +8143,13 @@
+ fi
+ 
+ cv=`echo "long long" | sed 'y%./+- %__p__%'`
+-echo "$as_me:5409: checking for long long" >&5
++echo "configure:8146: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5415 "configure"
++#line 8152 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -5429,37 +8166,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5432: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5435: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5437: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5440: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8169: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:5451: result: $ac_foo" >&5
++echo "configure:8179: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:5456: checking for long long" >&5
++	echo "configure:8184: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5462 "configure"
++#line 8190 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -5474,25 +8202,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:5477: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5480: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5482: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5485: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8205: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_long_long=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_long_long=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_long_long=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:5495: result: $ac_cv_type_long_long" >&5
++echo "configure:8214: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+ 
+@@ -5563,25 +8282,21 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:5566: checking for $ac_header" >&5
++
++echo "configure:8286: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5572 "configure"
++#line 8292 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:5576: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:5582: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:8298: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -5589,16 +8304,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:5601: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:8319: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5608,6 +8326,8 @@
+ fi
+ done
+ 
++	
++
+ if test "$ac_cv_header_err_h" = yes; then
+   have_err_h_TRUE=
+   have_err_h_FALSE='#'
+@@ -5654,13 +8374,13 @@
+   v6type=unknown
+ v6lib=none
+ 
+-echo "$as_me:5657: checking ipv6 stack type" >&5
++echo "configure:8377: checking ipv6 stack type" >&5
+ echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
+ for i in v6d toshiba kame inria zeta linux; do
+ 	case $i in
+ 	v6d)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5663 "configure"
++#line 8383 "configure"
+ #include "confdefs.h"
+ 
+ #include </usr/local/v6/include/sys/types.h>
+@@ -5679,7 +8399,7 @@
+ 		;;
+ 	toshiba)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5682 "configure"
++#line 8402 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/param.h>
+@@ -5698,7 +8418,7 @@
+ 		;;
+ 	kame)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5701 "configure"
++#line 8421 "configure"
+ #include "confdefs.h"
+ 
+ #include <netinet/in.h>
+@@ -5717,7 +8437,7 @@
+ 		;;
+ 	inria)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5720 "configure"
++#line 8440 "configure"
+ #include "confdefs.h"
+ 
+ #include <netinet/in.h>
+@@ -5734,7 +8454,7 @@
+ 		;;
+ 	zeta)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5737 "configure"
++#line 8457 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/param.h>
+@@ -5764,7 +8484,7 @@
+ 		break
+ 	fi
+ done
+-echo "$as_me:5767: result: $v6type" >&5
++echo "configure:8487: result: $v6type" >&5
+ echo "${ECHO_T}$v6type" >&6
+ 
+ if test "$v6lib" != "none"; then
+@@ -5776,7 +8496,7 @@
+ 	done
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 5779 "configure"
++#line 8499 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -5811,28 +8531,19 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5814: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5817: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5819: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5822: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8534: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipv6=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_ipv6=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_ipv6=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:5833: checking for IPv6" >&5
++echo "configure:8544: checking for IPv6" >&5
+ echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
+-echo "$as_me:5835: result: $ac_cv_lib_ipv6" >&5
++echo "configure:8546: result: $ac_cv_lib_ipv6" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 
+@@ -5842,7 +8553,7 @@
+ 
+ fi
+ 
+-echo "$as_me:5845: checking for socket" >&5
++echo "configure:8556: checking for socket" >&5
+ echo $ECHO_N "checking for socket... $ECHO_C" >&6
+ if test "${ac_cv_funclib_socket+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -5858,7 +8569,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 5861 "configure"
++#line 8572 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -5870,20 +8581,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5873: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5876: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5878: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5881: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8584: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -5896,17 +8598,17 @@
+ eval "ac_res=\$ac_cv_funclib_socket"
+ 
+ if false; then
+-
++	
+ for ac_func in socket
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:5903: checking for $ac_func" >&5
++echo "configure:8605: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 5909 "configure"
++#line 8611 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -5937,25 +8639,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:5940: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5943: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:5945: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:5948: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8642: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:5958: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:8651: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -5979,13 +8672,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:5982: result: yes" >&5
++	echo "configure:8675: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_socket=no"
+ 	eval "LIB_socket="
+-	echo "$as_me:5988: result: no" >&5
++	echo "configure:8681: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -5999,7 +8692,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:6002: result: yes, in $ac_res" >&5
++	echo "configure:8695: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6008,7 +8701,7 @@
+ 	LIBS="$LIB_socket $LIBS"
+ fi
+ 
+-echo "$as_me:6011: checking for gethostbyname" >&5
++echo "configure:8704: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6024,7 +8717,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6027 "configure"
++#line 8720 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6036,20 +8729,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6039: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6042: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6044: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6047: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8732: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -6062,17 +8746,17 @@
+ eval "ac_res=\$ac_cv_funclib_gethostbyname"
+ 
+ if false; then
+-
++	
+ for ac_func in gethostbyname
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:6069: checking for $ac_func" >&5
++echo "configure:8753: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6075 "configure"
++#line 8759 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6103,25 +8787,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6106: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6109: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6111: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6114: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8790: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6124: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:8799: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6145,13 +8820,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:6148: result: yes" >&5
++	echo "configure:8823: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname=no"
+ 	eval "LIB_gethostbyname="
+-	echo "$as_me:6154: result: no" >&5
++	echo "configure:8829: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6165,7 +8840,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:6168: result: yes, in $ac_res" >&5
++	echo "configure:8843: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6174,7 +8849,7 @@
+ 	LIBS="$LIB_gethostbyname $LIBS"
+ fi
+ 
+-echo "$as_me:6177: checking for syslog" >&5
++echo "configure:8852: checking for syslog" >&5
+ echo $ECHO_N "checking for syslog... $ECHO_C" >&6
+ if test "${ac_cv_funclib_syslog+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6190,7 +8865,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6193 "configure"
++#line 8868 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6202,20 +8877,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6205: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6208: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6210: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6213: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8880: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_syslog=$ac_lib; else ac_cv_funclib_syslog=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -6228,17 +8894,17 @@
+ eval "ac_res=\$ac_cv_funclib_syslog"
+ 
+ if false; then
+-
++	
+ for ac_func in syslog
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:6235: checking for $ac_func" >&5
++echo "configure:8901: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6241 "configure"
++#line 8907 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6269,25 +8935,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6272: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6275: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6277: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6280: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:8938: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6290: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:8947: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6311,13 +8968,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:6314: result: yes" >&5
++	echo "configure:8971: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_syslog=no"
+ 	eval "LIB_syslog="
+-	echo "$as_me:6320: result: no" >&5
++	echo "configure:8977: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6331,7 +8988,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:6334: result: yes, in $ac_res" >&5
++	echo "configure:8991: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6340,7 +8997,7 @@
+ 	LIBS="$LIB_syslog $LIBS"
+ fi
+ 
+-echo "$as_me:6343: checking for gethostbyname2" >&5
++echo "configure:9000: checking for gethostbyname2" >&5
+ echo $ECHO_N "checking for gethostbyname2... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname2+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6356,7 +9013,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6359 "configure"
++#line 9016 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -6368,20 +9025,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6371: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6374: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6376: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6379: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9028: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname2=$ac_lib; else ac_cv_funclib_gethostbyname2=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -6394,17 +9042,17 @@
+ eval "ac_res=\$ac_cv_funclib_gethostbyname2"
+ 
+ if false; then
+-
++	
+ for ac_func in gethostbyname2
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:6401: checking for $ac_func" >&5
++echo "configure:9049: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6407 "configure"
++#line 9055 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6435,25 +9083,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6438: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6441: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6443: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6446: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9086: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6456: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:9095: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6477,13 +9116,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:6480: result: yes" >&5
++	echo "configure:9119: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_gethostbyname2=no"
+ 	eval "LIB_gethostbyname2="
+-	echo "$as_me:6486: result: no" >&5
++	echo "configure:9125: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6497,7 +9136,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:6500: result: yes, in $ac_res" >&5
++	echo "configure:9139: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6506,7 +9145,7 @@
+ 	LIBS="$LIB_gethostbyname2 $LIBS"
+ fi
+ 
+-echo "$as_me:6509: checking for res_search" >&5
++echo "configure:9148: checking for res_search" >&5
+ echo $ECHO_N "checking for res_search... $ECHO_C" >&6
+ if test "${ac_cv_funclib_res_search+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6522,7 +9161,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6525 "configure"
++#line 9164 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6548,20 +9187,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6551: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6554: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6556: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6559: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9190: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_res_search=$ac_lib; else ac_cv_funclib_res_search=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -6574,17 +9204,17 @@
+ eval "ac_res=\$ac_cv_funclib_res_search"
+ 
+ if false; then
+-
++	
+ for ac_func in res_search
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:6581: checking for $ac_func" >&5
++echo "configure:9211: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6587 "configure"
++#line 9217 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6615,25 +9245,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6618: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6621: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6623: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6626: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9248: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6636: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:9257: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6657,13 +9278,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:6660: result: yes" >&5
++	echo "configure:9281: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_res_search=no"
+ 	eval "LIB_res_search="
+-	echo "$as_me:6666: result: no" >&5
++	echo "configure:9287: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6677,7 +9298,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:6680: result: yes, in $ac_res" >&5
++	echo "configure:9301: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6686,7 +9307,7 @@
+ 	LIBS="$LIB_res_search $LIBS"
+ fi
+ 
+-echo "$as_me:6689: checking for dn_expand" >&5
++echo "configure:9310: checking for dn_expand" >&5
+ echo $ECHO_N "checking for dn_expand... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dn_expand+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6702,7 +9323,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 6705 "configure"
++#line 9326 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6728,20 +9349,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6731: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6734: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6736: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6739: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9352: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dn_expand=$ac_lib; else ac_cv_funclib_dn_expand=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -6754,17 +9366,17 @@
+ eval "ac_res=\$ac_cv_funclib_dn_expand"
+ 
+ if false; then
+-
++	
+ for ac_func in dn_expand
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:6761: checking for $ac_func" >&5
++echo "configure:9373: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6767 "configure"
++#line 9379 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -6795,25 +9407,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6798: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6801: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6803: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6806: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9410: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:6816: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:9419: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -6837,13 +9440,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:6840: result: yes" >&5
++	echo "configure:9443: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dn_expand=no"
+ 	eval "LIB_dn_expand="
+-	echo "$as_me:6846: result: no" >&5
++	echo "configure:9449: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -6857,7 +9460,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:6860: result: yes, in $ac_res" >&5
++	echo "configure:9463: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -6866,7 +9469,7 @@
+ 	LIBS="$LIB_dn_expand $LIBS"
+ fi
+ 
+-echo "$as_me:6869: checking for working snprintf" >&5
++echo "configure:9472: checking for working snprintf" >&5
+ echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6876,7 +9479,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6879 "configure"
++#line 9482 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -6889,30 +9492,23 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:6892: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6895: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:6896: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6899: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9495: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_snprintf_working=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_snprintf_working=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+ fi
+-echo "$as_me:6911: result: $ac_cv_func_snprintf_working" >&5
++echo "configure:9507: result: $ac_cv_func_snprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_working" >&6
+ 
+ if test "$ac_cv_func_snprintf_working" = yes; then
+-
++	
+ cat >>confdefs.h <<EOF
+ #define HAVE_SNPRINTF 1
+ EOF
+@@ -6921,13 +9517,13 @@
+ if test "$ac_cv_func_snprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_snprintf+set" != set -o "$ac_cv_func_snprintf" = yes; then
+-echo "$as_me:6924: checking if snprintf needs a prototype" >&5
++echo "configure:9520: checking if snprintf needs a prototype" >&5
+ echo $ECHO_N "checking if snprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_snprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6930 "configure"
++#line 9526 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -6942,29 +9538,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:6945: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6948: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:6950: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6953: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9541: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_snprintf_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_snprintf_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_snprintf_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:6963: result: $ac_cv_func_snprintf_noproto" >&5
++echo "configure:9550: result: $ac_cv_func_snprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_snprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_snprintf_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_SNPRINTF_PROTO 1
+ EOF
+@@ -6975,7 +9562,7 @@
+ 
+ fi
+ 
+-echo "$as_me:6978: checking for working vsnprintf" >&5
++echo "configure:9565: checking for working vsnprintf" >&5
+ echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -6985,7 +9572,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 6988 "configure"
++#line 9575 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7008,30 +9595,23 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:7011: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7014: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:7015: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7018: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9598: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_vsnprintf_working=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_vsnprintf_working=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+ fi
+-echo "$as_me:7030: result: $ac_cv_func_vsnprintf_working" >&5
++echo "configure:9610: result: $ac_cv_func_vsnprintf_working" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_working" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+-
++	
+ cat >>confdefs.h <<EOF
+ #define HAVE_VSNPRINTF 1
+ EOF
+@@ -7040,13 +9620,13 @@
+ if test "$ac_cv_func_vsnprintf_working" = yes; then
+ 
+ if test "$ac_cv_func_vsnprintf+set" != set -o "$ac_cv_func_vsnprintf" = yes; then
+-echo "$as_me:7043: checking if vsnprintf needs a prototype" >&5
++echo "configure:9623: checking if vsnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vsnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vsnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7049 "configure"
++#line 9629 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -7061,29 +9641,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7064: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7067: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7069: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7072: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9644: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vsnprintf_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_vsnprintf_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_vsnprintf_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7082: result: $ac_cv_func_vsnprintf_noproto" >&5
++echo "configure:9653: result: $ac_cv_func_vsnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vsnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vsnprintf_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_VSNPRINTF_PROTO 1
+ EOF
+@@ -7094,14 +9665,14 @@
+ 
+ fi
+ 
+-echo "$as_me:7097: checking for working glob" >&5
++echo "configure:9668: checking for working glob" >&5
+ echo $ECHO_N "checking for working glob... $ECHO_C" >&6
+ if test "${ac_cv_func_glob_working+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_cv_func_glob_working=yes
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 7104 "configure"
++#line 9675 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7117,29 +9688,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7120: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7123: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7125: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7128: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9691: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_glob_working=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_glob_working=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7138: result: $ac_cv_func_glob_working" >&5
++echo "configure:9700: result: $ac_cv_func_glob_working" >&5
+ echo "${ECHO_T}$ac_cv_func_glob_working" >&6
+ 
+ if test "$ac_cv_func_glob_working" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_GLOB 1
+ EOF
+@@ -7148,13 +9710,13 @@
+ if test "$ac_cv_func_glob_working" = yes; then
+ 
+ if test "$ac_cv_func_glob+set" != set -o "$ac_cv_func_glob" = yes; then
+-echo "$as_me:7151: checking if glob needs a prototype" >&5
++echo "configure:9713: checking if glob needs a prototype" >&5
+ echo $ECHO_N "checking if glob needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_glob_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7157 "configure"
++#line 9719 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <glob.h>
+@@ -7170,29 +9732,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7173: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7176: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7178: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7181: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9735: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_glob_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_glob_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_glob_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7191: result: $ac_cv_func_glob_noproto" >&5
++echo "configure:9744: result: $ac_cv_func_glob_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_glob_noproto" >&6
+ 
+ if test "$ac_cv_func_glob_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_GLOB_PROTO 1
+ EOF
+@@ -7237,13 +9790,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:7240: checking for $ac_func" >&5
++echo "configure:9793: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7246 "configure"
++#line 9799 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7274,25 +9827,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7277: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7280: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7282: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7285: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9830: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7295: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:9839: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7306,7 +9850,7 @@
+ 	LIBOBJS="$LIBOBJS getcap.o"
+ fi
+ 
+-echo "$as_me:7309: checking for getsockopt" >&5
++echo "configure:9853: checking for getsockopt" >&5
+ echo $ECHO_N "checking for getsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_getsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7322,7 +9866,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 7325 "configure"
++#line 9869 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -7339,20 +9883,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7342: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7345: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7347: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7350: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9886: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_getsockopt=$ac_lib; else ac_cv_funclib_getsockopt=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -7365,17 +9900,17 @@
+ eval "ac_res=\$ac_cv_funclib_getsockopt"
+ 
+ if false; then
+-
++	
+ for ac_func in getsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:7372: checking for $ac_func" >&5
++echo "configure:9907: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7378 "configure"
++#line 9913 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7406,25 +9941,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7409: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7412: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7414: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7417: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:9944: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7427: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:9953: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7448,13 +9974,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:7451: result: yes" >&5
++	echo "configure:9977: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_getsockopt=no"
+ 	eval "LIB_getsockopt="
+-	echo "$as_me:7457: result: no" >&5
++	echo "configure:9983: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -7468,12 +9994,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:7471: result: yes, in $ac_res" >&5
++	echo "configure:9997: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:7476: checking for setsockopt" >&5
++echo "configure:10002: checking for setsockopt" >&5
+ echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_setsockopt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7489,7 +10015,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 7492 "configure"
++#line 10018 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -7506,20 +10032,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7509: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7512: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7514: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7517: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10035: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_setsockopt=$ac_lib; else ac_cv_funclib_setsockopt=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -7532,17 +10049,17 @@
+ eval "ac_res=\$ac_cv_funclib_setsockopt"
+ 
+ if false; then
+-
++	
+ for ac_func in setsockopt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:7539: checking for $ac_func" >&5
++echo "configure:10056: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7545 "configure"
++#line 10062 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7573,25 +10090,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7576: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7579: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7581: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7584: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10093: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7594: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10102: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7615,13 +10123,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:7618: result: yes" >&5
++	echo "configure:10126: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_setsockopt=no"
+ 	eval "LIB_setsockopt="
+-	echo "$as_me:7624: result: no" >&5
++	echo "configure:10132: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -7635,12 +10143,12 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:7638: result: yes, in $ac_res" >&5
++	echo "configure:10146: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:7643: checking for hstrerror" >&5
++echo "configure:10151: checking for hstrerror" >&5
+ echo $ECHO_N "checking for hstrerror... $ECHO_C" >&6
+ if test "${ac_cv_funclib_hstrerror+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -7656,7 +10164,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 7659 "configure"
++#line 10167 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>
+@@ -7670,20 +10178,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7673: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7676: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7678: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7681: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10181: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_hstrerror=$ac_lib; else ac_cv_funclib_hstrerror=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -7696,17 +10195,17 @@
+ eval "ac_res=\$ac_cv_funclib_hstrerror"
+ 
+ if false; then
+-
++	
+ for ac_func in hstrerror
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:7703: checking for $ac_func" >&5
++echo "configure:10202: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7709 "configure"
++#line 10208 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -7737,25 +10236,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:7740: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7743: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7745: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7748: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10239: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:7758: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10248: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -7779,13 +10269,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:7782: result: yes" >&5
++	echo "configure:10272: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_hstrerror=no"
+ 	eval "LIB_hstrerror="
+-	echo "$as_me:7788: result: no" >&5
++	echo "configure:10278: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -7799,7 +10289,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:7802: result: yes, in $ac_res" >&5
++	echo "configure:10292: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -7815,13 +10305,13 @@
+ if test "$ac_cv_func_hstrerror" = yes; then
+ 
+ if test "$ac_cv_func_hstrerror+set" != set -o "$ac_cv_func_hstrerror" = yes; then
+-echo "$as_me:7818: checking if hstrerror needs a prototype" >&5
++echo "configure:10308: checking if hstrerror needs a prototype" >&5
+ echo $ECHO_N "checking if hstrerror needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_hstrerror_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7824 "configure"
++#line 10314 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_NETDB_H
+@@ -7839,29 +10329,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7842: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7845: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7847: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7850: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10332: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_hstrerror_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_hstrerror_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_hstrerror_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7860: result: $ac_cv_func_hstrerror_noproto" >&5
++echo "configure:10341: result: $ac_cv_func_hstrerror_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_hstrerror_noproto" >&6
+ 
+ if test "$ac_cv_func_hstrerror_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_HSTRERROR_PROTO 1
+ EOF
+@@ -7875,13 +10356,13 @@
+ if test "$ac_cv_func_asprintf" = yes; then
+ 
+ if test "$ac_cv_func_asprintf+set" != set -o "$ac_cv_func_asprintf" = yes; then
+-echo "$as_me:7878: checking if asprintf needs a prototype" >&5
++echo "configure:10359: checking if asprintf needs a prototype" >&5
+ echo $ECHO_N "checking if asprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_asprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7884 "configure"
++#line 10365 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7898,29 +10379,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7901: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7904: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7906: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7909: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10382: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_asprintf_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_asprintf_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_asprintf_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7919: result: $ac_cv_func_asprintf_noproto" >&5
++echo "configure:10391: result: $ac_cv_func_asprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_asprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_asprintf_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_ASPRINTF_PROTO 1
+ EOF
+@@ -7932,13 +10404,13 @@
+ if test "$ac_cv_func_vasprintf" = yes; then
+ 
+ if test "$ac_cv_func_vasprintf+set" != set -o "$ac_cv_func_vasprintf" = yes; then
+-echo "$as_me:7935: checking if vasprintf needs a prototype" >&5
++echo "configure:10407: checking if vasprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vasprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vasprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7941 "configure"
++#line 10413 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -7955,29 +10427,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:7958: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7961: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:7963: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:7966: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10430: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vasprintf_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_vasprintf_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_vasprintf_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:7976: result: $ac_cv_func_vasprintf_noproto" >&5
++echo "configure:10439: result: $ac_cv_func_vasprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vasprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vasprintf_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_VASPRINTF_PROTO 1
+ EOF
+@@ -7989,13 +10452,13 @@
+ if test "$ac_cv_func_asnprintf" = yes; then
+ 
+ if test "$ac_cv_func_asnprintf+set" != set -o "$ac_cv_func_asnprintf" = yes; then
+-echo "$as_me:7992: checking if asnprintf needs a prototype" >&5
++echo "configure:10455: checking if asnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if asnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_asnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 7998 "configure"
++#line 10461 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -8012,29 +10475,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8015: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8018: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8020: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8023: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10478: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_asnprintf_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_asnprintf_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_asnprintf_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:8033: result: $ac_cv_func_asnprintf_noproto" >&5
++echo "configure:10487: result: $ac_cv_func_asnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_asnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_asnprintf_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_ASNPRINTF_PROTO 1
+ EOF
+@@ -8046,13 +10500,13 @@
+ if test "$ac_cv_func_vasnprintf" = yes; then
+ 
+ if test "$ac_cv_func_vasnprintf+set" != set -o "$ac_cv_func_vasnprintf" = yes; then
+-echo "$as_me:8049: checking if vasnprintf needs a prototype" >&5
++echo "configure:10503: checking if vasnprintf needs a prototype" >&5
+ echo $ECHO_N "checking if vasnprintf needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_vasnprintf_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8055 "configure"
++#line 10509 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -8069,29 +10523,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8072: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8075: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8077: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8080: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10526: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_vasnprintf_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_vasnprintf_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_vasnprintf_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:8090: result: $ac_cv_func_vasnprintf_noproto" >&5
++echo "configure:10535: result: $ac_cv_func_vasnprintf_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_vasnprintf_noproto" >&6
+ 
+ if test "$ac_cv_func_vasnprintf_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_VASNPRINTF_PROTO 1
+ EOF
+@@ -8101,7 +10546,7 @@
+ fi
+ fi
+ 
+-echo "$as_me:8104: checking for pidfile" >&5
++echo "configure:10549: checking for pidfile" >&5
+ echo $ECHO_N "checking for pidfile... $ECHO_C" >&6
+ if test "${ac_cv_funclib_pidfile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -8117,7 +10562,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 8120 "configure"
++#line 10565 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_UTIL_H
+ #include <util.h>
+@@ -8131,20 +10576,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8134: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8137: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8139: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8142: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10579: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_pidfile=$ac_lib; else ac_cv_funclib_pidfile=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -8157,17 +10593,17 @@
+ eval "ac_res=\$ac_cv_funclib_pidfile"
+ 
+ if false; then
+-
++	
+ for ac_func in pidfile
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:8164: checking for $ac_func" >&5
++echo "configure:10600: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8170 "configure"
++#line 10606 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -8198,25 +10634,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8201: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8204: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8206: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8209: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10637: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8219: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10646: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -8240,13 +10667,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:8243: result: yes" >&5
++	echo "configure:10670: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_pidfile=no"
+ 	eval "LIB_pidfile="
+-	echo "$as_me:8249: result: no" >&5
++	echo "configure:10676: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -8260,7 +10687,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:8263: result: yes, in $ac_res" >&5
++	echo "configure:10690: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -8334,13 +10761,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:8337: checking for $ac_func" >&5
++echo "configure:10764: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8343 "configure"
++#line 10770 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -8371,25 +10798,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8374: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8377: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8379: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8382: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10801: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8392: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10810: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+ 
+@@ -8403,6 +10821,7 @@
+ fi
+ 
+ if false; then
++	
+ 
+ for ac_func in \
+ 	chown					\
+@@ -8473,13 +10892,13 @@
+ 
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:8476: checking for $ac_func" >&5
++echo "configure:10895: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8482 "configure"
++#line 10901 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -8510,25 +10929,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8513: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8516: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8518: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8521: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10932: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8531: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:10941: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -8543,13 +10953,13 @@
+ 
+ for ac_func in inet_aton
+ do
+-echo "$as_me:8546: checking for $ac_func" >&5
++echo "configure:10956: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8552 "configure"
++#line 10962 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -8581,21 +10991,12 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8584: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8587: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8589: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8592: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:10994: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "ac_cv_func_$ac_func=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_$ac_func=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+@@ -8606,26 +11007,26 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-  echo "$as_me:8609: result: yes" >&5
++  echo "configure:11010: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:8612: result: no" >&5
++  echo "configure:11013: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   LIBOBJS="$LIBOBJS ${ac_func}.o"
+ fi
+ done
+ if false; then
+-
++	
+ for ac_func in inet_aton
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:8622: checking for $ac_func" >&5
++echo "configure:11023: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8628 "configure"
++#line 11029 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -8656,25 +11057,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8659: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8662: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8664: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8667: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11060: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8677: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:11069: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -8688,13 +11080,13 @@
+ 
+ for ac_func in inet_ntop
+ do
+-echo "$as_me:8691: checking for $ac_func" >&5
++echo "configure:11083: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8697 "configure"
++#line 11089 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -8726,21 +11118,12 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8729: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8732: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8734: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8737: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11121: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "ac_cv_func_$ac_func=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_$ac_func=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+@@ -8751,26 +11134,26 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-  echo "$as_me:8754: result: yes" >&5
++  echo "configure:11137: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:8757: result: no" >&5
++  echo "configure:11140: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   LIBOBJS="$LIBOBJS ${ac_func}.o"
+ fi
+ done
+ if false; then
+-
++	
+ for ac_func in inet_ntop
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:8767: checking for $ac_func" >&5
++echo "configure:11150: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8773 "configure"
++#line 11156 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -8801,25 +11184,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8804: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8807: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8809: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8812: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11187: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8822: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:11196: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -8833,13 +11207,13 @@
+ 
+ for ac_func in inet_pton
+ do
+-echo "$as_me:8836: checking for $ac_func" >&5
++echo "configure:11210: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8842 "configure"
++#line 11216 "configure"
+ #include "confdefs.h"
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -8871,21 +11245,12 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8874: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8877: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8879: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8882: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11248: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "ac_cv_func_$ac_func=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_$ac_func=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_$ac_func=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+@@ -8896,26 +11261,26 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-  echo "$as_me:8899: result: yes" >&5
++  echo "configure:11264: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+-  echo "$as_me:8902: result: no" >&5
++  echo "configure:11267: result: no" >&5
+ echo "${ECHO_T}no" >&6
+   LIBOBJS="$LIBOBJS ${ac_func}.o"
+ fi
+ done
+ if false; then
+-
++	
+ for ac_func in inet_pton
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:8912: checking for $ac_func" >&5
++echo "configure:11277: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 8918 "configure"
++#line 11283 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -8946,25 +11311,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:8949: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8952: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:8954: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:8957: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11314: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:8967: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:11323: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -8976,14 +11332,14 @@
+ 
+ fi
+ 
+-echo "$as_me:8979: checking for sa_len in struct sockaddr" >&5
++echo "configure:11335: checking for sa_len in struct sockaddr" >&5
+ echo $ECHO_N "checking for sa_len in struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_sa_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 8986 "configure"
++#line 11342 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -8996,48 +11352,39 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:8999: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9002: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9004: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9007: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11355: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_sa_len=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_sockaddr_sa_len=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_sockaddr_sa_len=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9017: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
++echo "configure:11364: result: $ac_cv_type_struct_sockaddr_sa_len" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_sa_len" >&6
+ if test "$ac_cv_type_struct_sockaddr_sa_len" = yes; then
+-
++	
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
+ EOF
+ 
++	
+ fi
+ 
+ if test "$ac_cv_func_getnameinfo" = "yes"; then
+ 
+-echo "$as_me:9029: checking if getnameinfo is broken" >&5
++echo "configure:11378: checking if getnameinfo is broken" >&5
+ echo $ECHO_N "checking if getnameinfo is broken... $ECHO_C" >&6
+ if test "${ac_cv_func_getnameinfo_broken+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:9035: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9040 "configure"
++#line 11387 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -9063,26 +11410,19 @@
+ 
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:9066: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9069: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:9070: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9073: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11413: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   ac_cv_func_getnameinfo_broken=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_getnameinfo_broken=yes
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_getnameinfo_broken=yes
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+ fi
+-echo "$as_me:9085: result: $ac_cv_func_getnameinfo_broken" >&5
++echo "configure:11425: result: $ac_cv_func_getnameinfo_broken" >&5
+ echo "${ECHO_T}$ac_cv_func_getnameinfo_broken" >&6
+   if test "$ac_cv_func_getnameinfo_broken" = yes; then
+     LIBOBJS="$LIBOBJS getnameinfo.o"
+@@ -9090,13 +11430,13 @@
+ fi
+ 
+ if test "$ac_cv_func_setenv+set" != set -o "$ac_cv_func_setenv" = yes; then
+-echo "$as_me:9093: checking if setenv needs a prototype" >&5
++echo "configure:11433: checking if setenv needs a prototype" >&5
+ echo $ECHO_N "checking if setenv needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_setenv_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9099 "configure"
++#line 11439 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -9111,29 +11451,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9114: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9117: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9119: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9122: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11454: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_setenv_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_setenv_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_setenv_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9132: result: $ac_cv_func_setenv_noproto" >&5
++echo "configure:11463: result: $ac_cv_func_setenv_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_setenv_noproto" >&6
+ 
+ if test "$ac_cv_func_setenv_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_SETENV_PROTO 1
+ EOF
+@@ -9143,13 +11474,13 @@
+ fi
+ 
+ if test "$ac_cv_func_unsetenv+set" != set -o "$ac_cv_func_unsetenv" = yes; then
+-echo "$as_me:9146: checking if unsetenv needs a prototype" >&5
++echo "configure:11477: checking if unsetenv needs a prototype" >&5
+ echo $ECHO_N "checking if unsetenv needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_unsetenv_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9152 "configure"
++#line 11483 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ int
+@@ -9164,29 +11495,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9167: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9170: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9172: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9175: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11498: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_unsetenv_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_unsetenv_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_unsetenv_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9185: result: $ac_cv_func_unsetenv_noproto" >&5
++echo "configure:11507: result: $ac_cv_func_unsetenv_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_unsetenv_noproto" >&6
+ 
+ if test "$ac_cv_func_unsetenv_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_UNSETENV_PROTO 1
+ EOF
+@@ -9196,13 +11518,13 @@
+ fi
+ 
+ if test "$ac_cv_func_gethostname+set" != set -o "$ac_cv_func_gethostname" = yes; then
+-echo "$as_me:9199: checking if gethostname needs a prototype" >&5
++echo "configure:11521: checking if gethostname needs a prototype" >&5
+ echo $ECHO_N "checking if gethostname needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostname_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9205 "configure"
++#line 11527 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -9217,29 +11539,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9220: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9223: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9225: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9228: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11542: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostname_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_gethostname_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_gethostname_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9238: result: $ac_cv_func_gethostname_noproto" >&5
++echo "configure:11551: result: $ac_cv_func_gethostname_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostname_noproto" >&6
+ 
+ if test "$ac_cv_func_gethostname_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_GETHOSTNAME_PROTO 1
+ EOF
+@@ -9249,13 +11562,13 @@
+ fi
+ 
+ if test "$ac_cv_func_mkstemp+set" != set -o "$ac_cv_func_mkstemp" = yes; then
+-echo "$as_me:9252: checking if mkstemp needs a prototype" >&5
++echo "configure:11565: checking if mkstemp needs a prototype" >&5
+ echo $ECHO_N "checking if mkstemp needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_mkstemp_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9258 "configure"
++#line 11571 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -9270,29 +11583,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9273: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9276: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9278: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9281: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11586: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_mkstemp_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_mkstemp_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_mkstemp_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9291: result: $ac_cv_func_mkstemp_noproto" >&5
++echo "configure:11595: result: $ac_cv_func_mkstemp_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_mkstemp_noproto" >&6
+ 
+ if test "$ac_cv_func_mkstemp_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_MKSTEMP_PROTO 1
+ EOF
+@@ -9302,13 +11606,13 @@
+ fi
+ 
+ if test "$ac_cv_func_getusershell+set" != set -o "$ac_cv_func_getusershell" = yes; then
+-echo "$as_me:9305: checking if getusershell needs a prototype" >&5
++echo "configure:11609: checking if getusershell needs a prototype" >&5
+ echo $ECHO_N "checking if getusershell needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getusershell_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9311 "configure"
++#line 11615 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int
+@@ -9323,29 +11627,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9326: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9329: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9331: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9334: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11630: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getusershell_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_getusershell_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_getusershell_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9344: result: $ac_cv_func_getusershell_noproto" >&5
++echo "configure:11639: result: $ac_cv_func_getusershell_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_getusershell_noproto" >&6
+ 
+ if test "$ac_cv_func_getusershell_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_GETUSERSHELL_PROTO 1
+ EOF
+@@ -9355,13 +11650,13 @@
+ fi
+ 
+ if test "$ac_cv_func_inet_aton+set" != set -o "$ac_cv_func_inet_aton" = yes; then
+-echo "$as_me:9358: checking if inet_aton needs a prototype" >&5
++echo "configure:11653: checking if inet_aton needs a prototype" >&5
+ echo $ECHO_N "checking if inet_aton needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_inet_aton_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9364 "configure"
++#line 11659 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -9388,29 +11683,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9391: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9394: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9396: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9399: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11686: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_inet_aton_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_inet_aton_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_inet_aton_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9409: result: $ac_cv_func_inet_aton_noproto" >&5
++echo "configure:11695: result: $ac_cv_func_inet_aton_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_inet_aton_noproto" >&6
+ 
+ if test "$ac_cv_func_inet_aton_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_INET_ATON_PROTO 1
+ EOF
+@@ -9419,7 +11705,7 @@
+ 
+ fi
+ 
+-echo "$as_me:9422: checking for crypt" >&5
++echo "configure:11708: checking for crypt" >&5
+ echo $ECHO_N "checking for crypt... $ECHO_C" >&6
+ if test "${ac_cv_funclib_crypt+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -9435,7 +11721,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 9438 "configure"
++#line 11724 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -9447,20 +11733,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9450: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9453: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9455: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9458: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11736: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_crypt=$ac_lib; else ac_cv_funclib_crypt=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -9473,17 +11750,17 @@
+ eval "ac_res=\$ac_cv_funclib_crypt"
+ 
+ if false; then
+-
++	
+ for ac_func in crypt
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:9480: checking for $ac_func" >&5
++echo "configure:11757: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9486 "configure"
++#line 11763 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -9514,25 +11791,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:9517: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9520: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9522: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9525: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11794: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:9535: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:11803: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -9556,13 +11824,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:9559: result: yes" >&5
++	echo "configure:11827: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_crypt=no"
+ 	eval "LIB_crypt="
+-	echo "$as_me:9565: result: no" >&5
++	echo "configure:11833: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -9576,18 +11844,18 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:9579: result: yes, in $ac_res" >&5
++	echo "configure:11847: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+-echo "$as_me:9584: checking if gethostbyname is compatible with system prototype" >&5
++echo "configure:11852: checking if gethostbyname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if gethostbyname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9590 "configure"
++#line 11858 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -9615,42 +11883,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9618: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9621: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9623: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9626: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11886: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostbyname_proto_compat=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_gethostbyname_proto_compat=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_gethostbyname_proto_compat=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9636: result: $ac_cv_func_gethostbyname_proto_compat" >&5
++echo "configure:11895: result: $ac_cv_func_gethostbyname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_gethostbyname_proto_compat" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define GETHOSTBYNAME_PROTO_COMPATIBLE 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:9647: checking if gethostbyaddr is compatible with system prototype" >&5
++echo "configure:11906: checking if gethostbyaddr is compatible with system prototype" >&5
+ echo $ECHO_N "checking if gethostbyaddr is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyaddr_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9653 "configure"
++#line 11912 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -9678,42 +11937,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9681: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9684: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9686: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9689: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11940: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_gethostbyaddr_proto_compat=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_gethostbyaddr_proto_compat=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_gethostbyaddr_proto_compat=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9699: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
++echo "configure:11949: result: $ac_cv_func_gethostbyaddr_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyaddr_proto_compat" >&6
+ 
+ if test "$ac_cv_func_gethostbyaddr_proto_compat" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define GETHOSTBYADDR_PROTO_COMPATIBLE 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:9710: checking if getservbyname is compatible with system prototype" >&5
++echo "configure:11960: checking if getservbyname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if getservbyname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getservbyname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9716 "configure"
++#line 11966 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -9741,42 +11991,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9744: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9747: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9749: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9752: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:11994: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getservbyname_proto_compat=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_getservbyname_proto_compat=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_getservbyname_proto_compat=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9762: result: $ac_cv_func_getservbyname_proto_compat" >&5
++echo "configure:12003: result: $ac_cv_func_getservbyname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_getservbyname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_getservbyname_proto_compat" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define GETSERVBYNAME_PROTO_COMPATIBLE 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:9773: checking if getsockname is compatible with system prototype" >&5
++echo "configure:12014: checking if getsockname is compatible with system prototype" >&5
+ echo $ECHO_N "checking if getsockname is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_getsockname_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9779 "configure"
++#line 12020 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -9795,42 +12036,33 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9798: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9801: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9803: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9806: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12039: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_getsockname_proto_compat=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_getsockname_proto_compat=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_getsockname_proto_compat=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9816: result: $ac_cv_func_getsockname_proto_compat" >&5
++echo "configure:12048: result: $ac_cv_func_getsockname_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_getsockname_proto_compat" >&6
+ 
+ if test "$ac_cv_func_getsockname_proto_compat" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define GETSOCKNAME_PROTO_COMPATIBLE 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:9827: checking if openlog is compatible with system prototype" >&5
++echo "configure:12059: checking if openlog is compatible with system prototype" >&5
+ echo $ECHO_N "checking if openlog is compatible with system prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_openlog_proto_compat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9833 "configure"
++#line 12065 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYSLOG_H
+@@ -9846,29 +12078,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9849: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9852: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9854: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9857: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12081: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_openlog_proto_compat=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_openlog_proto_compat=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_openlog_proto_compat=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9867: result: $ac_cv_func_openlog_proto_compat" >&5
++echo "configure:12090: result: $ac_cv_func_openlog_proto_compat" >&5
+ echo "${ECHO_T}$ac_cv_func_openlog_proto_compat" >&6
+ 
+ if test "$ac_cv_func_openlog_proto_compat" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define OPENLOG_PROTO_COMPATIBLE 1
+ EOF
+@@ -9876,13 +12099,13 @@
+ fi
+ 
+ if test "$ac_cv_func_crypt+set" != set -o "$ac_cv_func_crypt" = yes; then
+-echo "$as_me:9879: checking if crypt needs a prototype" >&5
++echo "configure:12102: checking if crypt needs a prototype" >&5
+ echo $ECHO_N "checking if crypt needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_crypt_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9885 "configure"
++#line 12108 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_CRYPT_H
+@@ -9904,29 +12127,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9907: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9910: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9912: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9915: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12130: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_crypt_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_crypt_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_crypt_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9925: result: $ac_cv_func_crypt_noproto" >&5
++echo "configure:12139: result: $ac_cv_func_crypt_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_crypt_noproto" >&6
+ 
+ if test "$ac_cv_func_crypt_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_CRYPT_PROTO 1
+ EOF
+@@ -9936,13 +12150,13 @@
+ fi
+ 
+ if test "$ac_cv_func_strtok_r+set" != set -o "$ac_cv_func_strtok_r" = yes; then
+-echo "$as_me:9939: checking if strtok_r needs a prototype" >&5
++echo "configure:12153: checking if strtok_r needs a prototype" >&5
+ echo $ECHO_N "checking if strtok_r needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_strtok_r_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 9945 "configure"
++#line 12159 "configure"
+ #include "confdefs.h"
+ 
+ #include <string.h>
+@@ -9959,29 +12173,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:9962: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9965: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:9967: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:9970: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12176: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_strtok_r_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_strtok_r_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_strtok_r_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:9980: result: $ac_cv_func_strtok_r_noproto" >&5
++echo "configure:12185: result: $ac_cv_func_strtok_r_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_strtok_r_noproto" >&6
+ 
+ if test "$ac_cv_func_strtok_r_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_STRTOK_R_PROTO 1
+ EOF
+@@ -9991,13 +12196,13 @@
+ fi
+ 
+ if test "$ac_cv_func_strsep+set" != set -o "$ac_cv_func_strsep" = yes; then
+-echo "$as_me:9994: checking if strsep needs a prototype" >&5
++echo "configure:12199: checking if strsep needs a prototype" >&5
+ echo $ECHO_N "checking if strsep needs a prototype... $ECHO_C" >&6
+ if test "${ac_cv_func_strsep_noproto+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10000 "configure"
++#line 12205 "configure"
+ #include "confdefs.h"
+ 
+ #include <string.h>
+@@ -10014,29 +12219,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10017: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10020: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10022: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10025: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12222: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_func_strsep_noproto=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_func_strsep_noproto=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_func_strsep_noproto=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10035: result: $ac_cv_func_strsep_noproto" >&5
++echo "configure:12231: result: $ac_cv_func_strsep_noproto" >&5
+ echo "${ECHO_T}$ac_cv_func_strsep_noproto" >&6
+ 
+ if test "$ac_cv_func_strsep_noproto" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define NEED_STRSEP_PROTO 1
+ EOF
+@@ -10045,14 +12241,14 @@
+ 
+ fi
+ 
+-echo "$as_me:10048: checking for h_errno" >&5
++echo "configure:12244: checking for h_errno" >&5
+ echo $ECHO_N "checking for h_errno... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errno+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10055 "configure"
++#line 12251 "configure"
+ #include "confdefs.h"
+ extern int h_errno;
+ int foo() { return h_errno; }
+@@ -10065,100 +12261,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10068: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10071: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10073: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10076: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12264: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_errno=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_var_h_errno=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_var_h_errno=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_errno`
+-echo "$as_me:10089: result: $ac_foo" >&5
++echo "configure:12276: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+-
++	
+ cat >>confdefs.h <<EOF
+ #define HAVE_H_ERRNO 1
+ EOF
+ 
+-echo "$as_me:10097: checking if h_errno is properly declared" >&5
+-echo $ECHO_N "checking if h_errno is properly declared... $ECHO_C" >&6
+-if test "${ac_cv_var_h_errno_declaration+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 10104 "configure"
+-#include "confdefs.h"
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+-#endif
+-#ifdef HAVE_NETDB_H
+-#include <netdb.h>
+-#endif
+-extern struct { int foo; } h_errno;
+-int
+-main ()
+-{
+-h_errno.foo = 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10122: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10125: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10127: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10130: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  eval "ac_cv_var_h_errno_declaration=no"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_h_errno_declaration=yes"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-
+-echo "$as_me:10142: result: $ac_cv_var_h_errno_declaration" >&5
+-echo "${ECHO_T}$ac_cv_var_h_errno_declaration" >&6
+-if eval "test \"\$ac_cv_var_h_errno_declaration\" = yes"; then
+-
+-cat >>confdefs.h <<\EOF
+-#define HAVE_H_ERRNO_DECLARATION 1
+-EOF
+-
+-fi
+-
++	
+ fi
+ 
+-echo "$as_me:10154: checking for h_errlist" >&5
++echo "configure:12287: checking for h_errlist" >&5
+ echo $ECHO_N "checking for h_errlist... $ECHO_C" >&6
+ if test "${ac_cv_var_h_errlist+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10161 "configure"
++#line 12294 "configure"
+ #include "confdefs.h"
+ extern int h_errlist;
+ int foo() { return h_errlist; }
+@@ -10171,97 +12304,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10174: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10177: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10179: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10182: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12307: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_errlist=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_var_h_errlist=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_var_h_errlist=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_errlist`
+-echo "$as_me:10195: result: $ac_foo" >&5
++echo "configure:12319: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+-
++	
+ cat >>confdefs.h <<EOF
+ #define HAVE_H_ERRLIST 1
+ EOF
+ 
+-echo "$as_me:10203: checking if h_errlist is properly declared" >&5
+-echo $ECHO_N "checking if h_errlist is properly declared... $ECHO_C" >&6
+-if test "${ac_cv_var_h_errlist_declaration+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 10210 "configure"
+-#include "confdefs.h"
+-#ifdef HAVE_NETDB_H
+-#include <netdb.h>
+-#endif
+-extern struct { int foo; } h_errlist;
+-int
+-main ()
+-{
+-h_errlist.foo = 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10225: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10228: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10230: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10233: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  eval "ac_cv_var_h_errlist_declaration=no"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_h_errlist_declaration=yes"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-
+-echo "$as_me:10245: result: $ac_cv_var_h_errlist_declaration" >&5
+-echo "${ECHO_T}$ac_cv_var_h_errlist_declaration" >&6
+-if eval "test \"\$ac_cv_var_h_errlist_declaration\" = yes"; then
+-
+-cat >>confdefs.h <<\EOF
+-#define HAVE_H_ERRLIST_DECLARATION 1
+-EOF
+-
++	
+ fi
+ 
+-fi
+-
+-echo "$as_me:10257: checking for h_nerr" >&5
++echo "configure:12330: checking for h_nerr" >&5
+ echo $ECHO_N "checking for h_nerr... $ECHO_C" >&6
+ if test "${ac_cv_var_h_nerr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10264 "configure"
++#line 12337 "configure"
+ #include "confdefs.h"
+ extern int h_nerr;
+ int foo() { return h_nerr; }
+@@ -10274,97 +12347,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10277: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10280: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10282: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10285: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12350: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_h_nerr=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_var_h_nerr=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_var_h_nerr=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_h_nerr`
+-echo "$as_me:10298: result: $ac_foo" >&5
++echo "configure:12362: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+-
++	
+ cat >>confdefs.h <<EOF
+ #define HAVE_H_NERR 1
+ EOF
+ 
+-echo "$as_me:10306: checking if h_nerr is properly declared" >&5
+-echo $ECHO_N "checking if h_nerr is properly declared... $ECHO_C" >&6
+-if test "${ac_cv_var_h_nerr_declaration+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 10313 "configure"
+-#include "confdefs.h"
+-#ifdef HAVE_NETDB_H
+-#include <netdb.h>
+-#endif
+-extern struct { int foo; } h_nerr;
+-int
+-main ()
+-{
+-h_nerr.foo = 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10328: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10331: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10333: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10336: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  eval "ac_cv_var_h_nerr_declaration=no"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_h_nerr_declaration=yes"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-
+-echo "$as_me:10348: result: $ac_cv_var_h_nerr_declaration" >&5
+-echo "${ECHO_T}$ac_cv_var_h_nerr_declaration" >&6
+-if eval "test \"\$ac_cv_var_h_nerr_declaration\" = yes"; then
+-
+-cat >>confdefs.h <<\EOF
+-#define HAVE_H_NERR_DECLARATION 1
+-EOF
+-
+-fi
+-
++	
+ fi
+ 
+-echo "$as_me:10360: checking for __progname" >&5
++echo "configure:12373: checking for __progname" >&5
+ echo $ECHO_N "checking for __progname... $ECHO_C" >&6
+ if test "${ac_cv_var___progname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10367 "configure"
++#line 12380 "configure"
+ #include "confdefs.h"
+ extern int __progname;
+ int foo() { return __progname; }
+@@ -10377,97 +12390,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10380: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10383: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10385: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10388: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12393: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var___progname=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_var___progname=no
+-fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-
+-ac_foo=`eval echo \\$ac_cv_var___progname`
+-echo "$as_me:10401: result: $ac_foo" >&5
+-echo "${ECHO_T}$ac_foo" >&6
+-if test "$ac_foo" = yes; then
+-
+-cat >>confdefs.h <<EOF
+-#define HAVE___PROGNAME 1
+-EOF
+-
+-echo "$as_me:10409: checking if __progname is properly declared" >&5
+-echo $ECHO_N "checking if __progname is properly declared... $ECHO_C" >&6
+-if test "${ac_cv_var___progname_declaration+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 10416 "configure"
+-#include "confdefs.h"
+-#ifdef HAVE_ERR_H
+-#include <err.h>
+-#endif
+-extern struct { int foo; } __progname;
+-int
+-main ()
+-{
+-__progname.foo = 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10431: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10434: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10436: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10439: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  eval "ac_cv_var___progname_declaration=no"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var___progname_declaration=yes"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_var___progname=no
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+-echo "$as_me:10451: result: $ac_cv_var___progname_declaration" >&5
+-echo "${ECHO_T}$ac_cv_var___progname_declaration" >&6
+-if eval "test \"\$ac_cv_var___progname_declaration\" = yes"; then
++fi
+ 
+-cat >>confdefs.h <<\EOF
+-#define HAVE___PROGNAME_DECLARATION 1
++ac_foo=`eval echo \\$ac_cv_var___progname`
++echo "configure:12405: result: $ac_foo" >&5
++echo "${ECHO_T}$ac_foo" >&6
++if test "$ac_foo" = yes; then
++	
++cat >>confdefs.h <<EOF
++#define HAVE___PROGNAME 1
+ EOF
+ 
++	
+ fi
+ 
+-fi
+-
+-echo "$as_me:10463: checking if optarg is properly declared" >&5
++echo "configure:12416: checking if optarg is properly declared" >&5
+ echo $ECHO_N "checking if optarg is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optarg_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10470 "configure"
++#line 12423 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -10483,44 +12436,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10486: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10489: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10491: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10494: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12439: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optarg_declaration=no"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_optarg_declaration=yes"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_var_optarg_declaration=yes"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:10506: result: $ac_cv_var_optarg_declaration" >&5
++echo "configure:12450: result: $ac_cv_var_optarg_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optarg_declaration" >&6
+ if eval "test \"\$ac_cv_var_optarg_declaration\" = yes"; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_OPTARG_DECLARATION 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:10516: checking if optind is properly declared" >&5
++echo "configure:12460: checking if optind is properly declared" >&5
+ echo $ECHO_N "checking if optind is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optind_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10523 "configure"
++#line 12467 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -10536,44 +12480,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10539: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10542: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10544: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10547: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12483: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optind_declaration=no"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_optind_declaration=yes"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_var_optind_declaration=yes"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:10559: result: $ac_cv_var_optind_declaration" >&5
++echo "configure:12494: result: $ac_cv_var_optind_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optind_declaration" >&6
+ if eval "test \"\$ac_cv_var_optind_declaration\" = yes"; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_OPTIND_DECLARATION 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:10569: checking if opterr is properly declared" >&5
++echo "configure:12504: checking if opterr is properly declared" >&5
+ echo $ECHO_N "checking if opterr is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_opterr_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10576 "configure"
++#line 12511 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -10589,44 +12524,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10592: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10595: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10597: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10600: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12527: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_opterr_declaration=no"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_opterr_declaration=yes"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_var_opterr_declaration=yes"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:10612: result: $ac_cv_var_opterr_declaration" >&5
++echo "configure:12538: result: $ac_cv_var_opterr_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_opterr_declaration" >&6
+ if eval "test \"\$ac_cv_var_opterr_declaration\" = yes"; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_OPTERR_DECLARATION 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:10622: checking if optopt is properly declared" >&5
++echo "configure:12548: checking if optopt is properly declared" >&5
+ echo $ECHO_N "checking if optopt is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_optopt_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10629 "configure"
++#line 12555 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #ifdef HAVE_UNISTD_H
+@@ -10642,44 +12568,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10645: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10648: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10650: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10653: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12571: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_optopt_declaration=no"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_optopt_declaration=yes"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_var_optopt_declaration=yes"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:10665: result: $ac_cv_var_optopt_declaration" >&5
++echo "configure:12582: result: $ac_cv_var_optopt_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_optopt_declaration" >&6
+ if eval "test \"\$ac_cv_var_optopt_declaration\" = yes"; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_OPTOPT_DECLARATION 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:10675: checking if environ is properly declared" >&5
++echo "configure:12592: checking if environ is properly declared" >&5
+ echo $ECHO_N "checking if environ is properly declared... $ECHO_C" >&6
+ if test "${ac_cv_var_environ_declaration+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10682 "configure"
++#line 12599 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ extern struct { int foo; } environ;
+@@ -10692,44 +12609,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10698: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10700: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10703: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12612: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_var_environ_declaration=no"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_environ_declaration=yes"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_var_environ_declaration=yes"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:10715: result: $ac_cv_var_environ_declaration" >&5
++echo "configure:12623: result: $ac_cv_var_environ_declaration" >&5
+ echo "${ECHO_T}$ac_cv_var_environ_declaration" >&6
+ if eval "test \"\$ac_cv_var_environ_declaration\" = yes"; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_ENVIRON_DECLARATION 1
+ EOF
+ 
+ fi
+ 
+-echo "$as_me:10725: checking for tm_gmtoff in struct tm" >&5
++echo "configure:12633: checking for tm_gmtoff in struct tm" >&5
+ echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_gmtoff+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10732 "configure"
++#line 12640 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -10741,42 +12649,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10744: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10747: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10749: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10752: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12652: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_gmtoff=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_tm_tm_gmtoff=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_tm_tm_gmtoff=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10762: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
++echo "configure:12661: result: $ac_cv_type_struct_tm_tm_gmtoff" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_gmtoff" >&6
+ if test "$ac_cv_type_struct_tm_tm_gmtoff" = yes; then
+-
++	
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_STRUCT_TM_TM_GMTOFF 1
+ EOF
+ 
++	
+ fi
+ 
+-echo "$as_me:10772: checking for tm_zone in struct tm" >&5
++echo "configure:12673: checking for tm_zone in struct tm" >&5
+ echo $ECHO_N "checking for tm_zone in struct tm... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_tm_tm_zone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10779 "configure"
++#line 12680 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int
+@@ -10788,42 +12689,35 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10791: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10794: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10796: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10799: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12692: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_tm_tm_zone=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_tm_tm_zone=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_tm_tm_zone=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:10809: result: $ac_cv_type_struct_tm_tm_zone" >&5
++echo "configure:12701: result: $ac_cv_type_struct_tm_tm_zone" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_tm_tm_zone" >&6
+ if test "$ac_cv_type_struct_tm_tm_zone" = yes; then
+-
++	
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_STRUCT_TM_TM_ZONE 1
+ EOF
+ 
++	
+ fi
+ 
+-echo "$as_me:10819: checking for timezone" >&5
++echo "configure:12713: checking for timezone" >&5
+ echo $ECHO_N "checking for timezone... $ECHO_C" >&6
+ if test "${ac_cv_var_timezone+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 10826 "configure"
++#line 12720 "configure"
+ #include "confdefs.h"
+ extern int timezone;
+ int foo() { return timezone; }
+@@ -10836,95 +12730,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10842: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10844: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10847: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12733: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_var_timezone=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_var_timezone=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_var_timezone=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+ 
+ ac_foo=`eval echo \\$ac_cv_var_timezone`
+-echo "$as_me:10860: result: $ac_foo" >&5
++echo "configure:12745: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+-
++	
+ cat >>confdefs.h <<EOF
+ #define HAVE_TIMEZONE 1
+ EOF
+ 
+-echo "$as_me:10868: checking if timezone is properly declared" >&5
+-echo $ECHO_N "checking if timezone is properly declared... $ECHO_C" >&6
+-if test "${ac_cv_var_timezone_declaration+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-cat >conftest.$ac_ext <<_ACEOF
+-#line 10875 "configure"
+-#include "confdefs.h"
+-#include <time.h>
+-extern struct { int foo; } timezone;
+-int
+-main ()
+-{
+-timezone.foo = 1;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10888: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10891: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10893: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10896: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  eval "ac_cv_var_timezone_declaration=no"
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_var_timezone_declaration=yes"
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
+-fi
+-
+-echo "$as_me:10908: result: $ac_cv_var_timezone_declaration" >&5
+-echo "${ECHO_T}$ac_cv_var_timezone_declaration" >&6
+-if eval "test \"\$ac_cv_var_timezone_declaration\" = yes"; then
+-
+-cat >>confdefs.h <<\EOF
+-#define HAVE_TIMEZONE_DECLARATION 1
+-EOF
+-
+-fi
+-
++	
+ fi
+ 
+ cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
+-echo "$as_me:10921: checking for sa_family_t" >&5
++echo "configure:12757: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10927 "configure"
++#line 12763 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -10941,37 +12777,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10944: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10947: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10949: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10952: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12780: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:10963: result: $ac_foo" >&5
++echo "configure:12790: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:10968: checking for sa_family_t" >&5
++	echo "configure:12795: checking for sa_family_t" >&5
+ echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sa_family_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 10974 "configure"
++#line 12801 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -10986,25 +12813,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:10989: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10992: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:10994: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:10997: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12816: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_sa_family_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_sa_family_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_sa_family_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11007: result: $ac_cv_type_sa_family_t" >&5
++echo "configure:12825: result: $ac_cv_type_sa_family_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sa_family_t" >&6
+ if test $ac_cv_type_sa_family_t = yes; then
+ 
+@@ -11023,13 +12841,13 @@
+ fi
+ 
+ cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
+-echo "$as_me:11026: checking for socklen_t" >&5
++echo "configure:12844: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11032 "configure"
++#line 12850 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -11046,37 +12864,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11049: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11052: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11054: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11057: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12867: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:11068: result: $ac_foo" >&5
++echo "configure:12877: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:11073: checking for socklen_t" >&5
++	echo "configure:12882: checking for socklen_t" >&5
+ echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
+ if test "${ac_cv_type_socklen_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11079 "configure"
++#line 12888 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -11091,25 +12900,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11094: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11097: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11099: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11102: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12903: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_socklen_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_socklen_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_socklen_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11112: result: $ac_cv_type_socklen_t" >&5
++echo "configure:12912: result: $ac_cv_type_socklen_t" >&5
+ echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
+ if test $ac_cv_type_socklen_t = yes; then
+ 
+@@ -11128,13 +12928,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
+-echo "$as_me:11131: checking for struct sockaddr" >&5
++echo "configure:12931: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11137 "configure"
++#line 12937 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -11151,37 +12951,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11154: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11157: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11159: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11162: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12954: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:11173: result: $ac_foo" >&5
++echo "configure:12964: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:11178: checking for struct sockaddr" >&5
++	echo "configure:12969: checking for struct sockaddr" >&5
+ echo $ECHO_N "checking for struct sockaddr... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11184 "configure"
++#line 12975 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -11196,25 +12987,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11199: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11202: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11204: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11207: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:12990: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_sockaddr=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_sockaddr=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11217: result: $ac_cv_type_struct_sockaddr" >&5
++echo "configure:12999: result: $ac_cv_type_struct_sockaddr" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr" >&6
+ if test $ac_cv_type_struct_sockaddr = yes; then
+ 
+@@ -11233,13 +13015,13 @@
+ fi
+ 
+ cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
+-echo "$as_me:11236: checking for struct sockaddr_storage" >&5
++echo "configure:13018: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11242 "configure"
++#line 13024 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -11256,37 +13038,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11259: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11262: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11264: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11267: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13041: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:11278: result: $ac_foo" >&5
++echo "configure:13051: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:11283: checking for struct sockaddr_storage" >&5
++	echo "configure:13056: checking for struct sockaddr_storage" >&5
+ echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_sockaddr_storage+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11289 "configure"
++#line 13062 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -11301,25 +13074,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11304: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11307: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11309: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11312: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13077: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_sockaddr_storage=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_sockaddr_storage=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_sockaddr_storage=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11322: result: $ac_cv_type_struct_sockaddr_storage" >&5
++echo "configure:13086: result: $ac_cv_type_struct_sockaddr_storage" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_sockaddr_storage" >&6
+ if test $ac_cv_type_struct_sockaddr_storage = yes; then
+ 
+@@ -11338,13 +13102,13 @@
+ fi
+ 
+ cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
+-echo "$as_me:11341: checking for struct addrinfo" >&5
++echo "configure:13105: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11347 "configure"
++#line 13111 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -11361,37 +13125,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11364: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11367: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11369: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11372: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13128: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:11383: result: $ac_foo" >&5
++echo "configure:13138: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:11388: checking for struct addrinfo" >&5
++	echo "configure:13143: checking for struct addrinfo" >&5
+ echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_addrinfo+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11394 "configure"
++#line 13149 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -11406,25 +13161,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11409: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11412: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11414: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11417: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13164: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_addrinfo=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_addrinfo=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_addrinfo=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11427: result: $ac_cv_type_struct_addrinfo" >&5
++echo "configure:13173: result: $ac_cv_type_struct_addrinfo" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_addrinfo" >&6
+ if test $ac_cv_type_struct_addrinfo = yes; then
+ 
+@@ -11443,13 +13189,13 @@
+ fi
+ 
+ cv=`echo "struct ifaddrs" | sed 'y%./+- %__p__%'`
+-echo "$as_me:11446: checking for struct ifaddrs" >&5
++echo "configure:13192: checking for struct ifaddrs" >&5
+ echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11452 "configure"
++#line 13198 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -11466,37 +13212,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11469: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11472: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11474: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11477: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13215: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:11488: result: $ac_foo" >&5
++echo "configure:13225: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo struct ifaddrs | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:11493: checking for struct ifaddrs" >&5
++	echo "configure:13230: checking for struct ifaddrs" >&5
+ echo $ECHO_N "checking for struct ifaddrs... $ECHO_C" >&6
+ if test "${ac_cv_type_struct_ifaddrs+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11499 "configure"
++#line 13236 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -11511,25 +13248,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11514: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11517: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11519: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11522: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13251: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_struct_ifaddrs=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_struct_ifaddrs=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_struct_ifaddrs=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:11532: result: $ac_cv_type_struct_ifaddrs" >&5
++echo "configure:13260: result: $ac_cv_type_struct_ifaddrs" >&5
+ echo "${ECHO_T}$ac_cv_type_struct_ifaddrs" >&6
+ if test $ac_cv_type_struct_ifaddrs = yes; then
+ 
+@@ -11547,7 +13275,7 @@
+ 
+ fi
+ 
+-echo "$as_me:11550: checking for struct winsize" >&5
++echo "configure:13278: checking for struct winsize" >&5
+ echo $ECHO_N "checking for struct winsize... $ECHO_C" >&6
+ if test "${ac_cv_struct_winsize+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -11556,7 +13284,7 @@
+ ac_cv_struct_winsize=no
+ for i in sys/termios.h sys/ioctl.h; do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11559 "configure"
++#line 13287 "configure"
+ #include "confdefs.h"
+ #include <$i>
+ 
+@@ -11577,10 +13305,10 @@
+ EOF
+ 
+ fi
+-echo "$as_me:11580: result: $ac_cv_struct_winsize" >&5
++echo "configure:13308: result: $ac_cv_struct_winsize" >&5
+ echo "${ECHO_T}$ac_cv_struct_winsize" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11583 "configure"
++#line 13311 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+@@ -11596,7 +13324,7 @@
+ rm -f conftest*
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11599 "configure"
++#line 13327 "configure"
+ #include "confdefs.h"
+ #include <termios.h>
+ 
+@@ -11611,14 +13339,14 @@
+ fi
+ rm -f conftest*
+ 
+-echo "$as_me:11614: checking for struct spwd" >&5
++echo "configure:13342: checking for struct spwd" >&5
+ echo $ECHO_N "checking for struct spwd... $ECHO_C" >&6
+ if test "${ac_cv_struct_spwd+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 11621 "configure"
++#line 13349 "configure"
+ #include "confdefs.h"
+ #include <pwd.h>
+ #ifdef HAVE_SHADOW_H
+@@ -11633,27 +13361,18 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11636: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11639: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11641: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11644: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13364: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_spwd=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_struct_spwd=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_struct_spwd=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+ 
+-echo "$as_me:11656: result: $ac_cv_struct_spwd" >&5
++echo "configure:13375: result: $ac_cv_struct_spwd" >&5
+ echo "${ECHO_T}$ac_cv_struct_spwd" >&6
+ 
+ if test "$ac_cv_struct_spwd" = "yes"; then
+@@ -11664,8 +13383,6 @@
+ 
+ fi
+ 
+-LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
+-
+ LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken"
+ 
+ # Check whether --with-openldap or --without-openldap was given.
+@@ -11678,9 +13395,7 @@
+ if test "${with_openldap_lib+set}" = set; then
+   withval="$with_openldap_lib"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:11681: error: No argument for --with-openldap-lib" >&5
+-echo "$as_me: error: No argument for --with-openldap-lib" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: No argument for --with-openldap-lib" >&2; exit 1; }
+ elif test "X$with_openldap" = "X"; then
+   with_openldap=yes
+ fi
+@@ -11690,15 +13405,13 @@
+ if test "${with_openldap_include+set}" = set; then
+   withval="$with_openldap_include"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:11693: error: No argument for --with-openldap-include" >&5
+-echo "$as_me: error: No argument for --with-openldap-include" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: No argument for --with-openldap-include" >&2; exit 1; }
+ elif test "X$with_openldap" = "X"; then
+   with_openldap=yes
+ fi
+ fi;
+ 
+-echo "$as_me:11701: checking for openldap" >&5
++echo "configure:13414: checking for openldap" >&5
+ echo $ECHO_N "checking for openldap... $ECHO_C" >&6
+ 
+ case "$with_openldap" in
+@@ -11716,7 +13429,7 @@
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -11738,7 +13451,7 @@
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11741 "configure"
++#line 13454 "configure"
+ #include "confdefs.h"
+ #include <ldap.h>
+ int
+@@ -11750,27 +13463,18 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11753: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11756: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11758: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11761: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13466: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lldap -llber  $save_LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11773 "configure"
++#line 13477 "configure"
+ #include "confdefs.h"
+ #include <ldap.h>
+ int
+@@ -11782,20 +13486,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11785: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11788: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11790: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11793: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13489: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+@@ -11805,21 +13500,19 @@
+ if test "$ires" -a "$lres" -a "$with_openldap" != "no"; then
+ 	openldap_includedir="$ires"
+ 	openldap_libdir="$lres"
++	DIR_openldap=
+ 	INCLUDE_openldap="-I$openldap_includedir"
+ 	LIB_openldap="-L$openldap_libdir -lldap -llber"
+-
+-cat >>confdefs.h <<EOF
+-#define OPENLDAP 1
+-EOF
+-
++	
+ 	with_openldap=yes
+-	echo "$as_me:11816: result: headers $ires, libraries $lres" >&5
++	echo "configure:13508: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_openldap="openldap"
+ 	INCLUDE_openldap=
+ 	LIB_openldap=
+ 	with_openldap=no
+-	echo "$as_me:11822: result: $with_openldap" >&5
++	echo "configure:13515: result: $with_openldap" >&5
+ echo "${ECHO_T}$with_openldap" >&6
+ fi
+ 
+@@ -11837,9 +13530,7 @@
+ if test "${with_krb4_lib+set}" = set; then
+   withval="$with_krb4_lib"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:11840: error: No argument for --with-krb4-lib" >&5
+-echo "$as_me: error: No argument for --with-krb4-lib" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: No argument for --with-krb4-lib" >&2; exit 1; }
+ elif test "X$with_krb4" = "X"; then
+   with_krb4=yes
+ fi
+@@ -11849,15 +13540,13 @@
+ if test "${with_krb4_include+set}" = set; then
+   withval="$with_krb4_include"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:11852: error: No argument for --with-krb4-include" >&5
+-echo "$as_me: error: No argument for --with-krb4-include" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: No argument for --with-krb4-include" >&2; exit 1; }
+ elif test "X$with_krb4" = "X"; then
+   with_krb4=yes
+ fi
+ fi;
+ 
+-echo "$as_me:11860: checking for krb4" >&5
++echo "configure:13549: checking for krb4" >&5
+ echo $ECHO_N "checking for krb4... $ECHO_C" >&6
+ 
+ case "$with_krb4" in
+@@ -11874,8 +13563,8 @@
+ esac
+ header_dirs=
+ lib_dirs=
+-d='/usr/athena'
+-for i in $d; do
++d=''
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -11897,7 +13586,7 @@
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11900 "configure"
++#line 13589 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -11909,27 +13598,18 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:11912: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11915: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11917: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11920: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13601: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lkrb -ldes $save_LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 11932 "configure"
++#line 13612 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -11941,20 +13621,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:11944: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11947: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:11949: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:11952: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13624: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+@@ -11964,24 +13635,26 @@
+ if test "$ires" -a "$lres" -a "$with_krb4" != "no"; then
+ 	krb4_includedir="$ires"
+ 	krb4_libdir="$lres"
++	DIR_krb4=
+ 	INCLUDE_krb4="-I$krb4_includedir"
+ 	LIB_krb4="-L$krb4_libdir -lkrb"
+-
+-cat >>confdefs.h <<EOF
+-#define KRB4 1
+-EOF
+-
++	
+ 	with_krb4=yes
+-	echo "$as_me:11975: result: headers $ires, libraries $lres" >&5
++	echo "configure:13643: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_krb4="krb4"
+ 	INCLUDE_krb4=
+ 	LIB_krb4=
+ 	with_krb4=no
+-	echo "$as_me:11981: result: $with_krb4" >&5
++	echo "configure:13650: result: $with_krb4" >&5
+ echo "${ECHO_T}$with_krb4" >&6
+ fi
+ 
++if test "$krb4_libdir" = "/usr/lib"; then
++  krb4_libdir="";
++fi
++
+ LIB_kdb=
+ if test "$with_krb4" != "no"; then
+ 	save_CFLAGS="$CFLAGS"
+@@ -11989,14 +13662,14 @@
+ 	save_LIBS="$LIBS"
+ 	LIBS="$LIB_krb4 -ldes $LIBS"
+ 	EXTRA_LIB45=lib45.a
+-
+-	echo "$as_me:11993: checking for four valued krb_put_int" >&5
++	
++	echo "configure:13666: checking for four valued krb_put_int" >&5
+ echo $ECHO_N "checking for four valued krb_put_int... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_put_int_four+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 11999 "configure"
++#line 13672 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -12010,42 +13683,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12016: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12018: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12021: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13686: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_put_int_four=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_krb_put_int_four=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_krb_put_int_four=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-
++	
+ fi
+-echo "$as_me:12032: result: $ac_cv_func_krb_put_int_four" >&5
++echo "configure:13696: result: $ac_cv_func_krb_put_int_four" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_put_int_four" >&6
+ 	if test "$ac_cv_func_krb_put_int_four" = yes; then
+-
++		
+ cat >>confdefs.h <<\EOF
+ #define HAVE_FOUR_VALUED_KRB_PUT_INT 1
+ EOF
+ 
+ 	fi
++	
+ 
+-	echo "$as_me:12042: checking for KRB_VERIFY_SECURE" >&5
++	echo "configure:13707: checking for KRB_VERIFY_SECURE" >&5
+ echo $ECHO_N "checking for KRB_VERIFY_SECURE... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_verify_secure+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12048 "configure"
++#line 13713 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -12058,45 +13723,37 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12061: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12064: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12066: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12069: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13726: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_verify_secure=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_krb_verify_secure=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_krb_verify_secure=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-
++	
+ fi
+-echo "$as_me:12080: result: $ac_cv_func_krb_verify_secure" >&5
++echo "configure:13736: result: $ac_cv_func_krb_verify_secure" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_verify_secure" >&6
+ 	if test "$ac_cv_func_krb_verify_secure" != yes; then
+-
++		
+ cat >>confdefs.h <<\EOF
+ #define KRB_VERIFY_SECURE 1
+ EOF
+ 
++		
+ cat >>confdefs.h <<\EOF
+ #define KRB_VERIFY_SECURE_FAIL 2
+ EOF
+ 
+ 	fi
+-	echo "$as_me:12093: checking for KRB_VERIFY_NOT_SECURE" >&5
++	echo "configure:13750: checking for KRB_VERIFY_NOT_SECURE" >&5
+ echo $ECHO_N "checking for KRB_VERIFY_NOT_SECURE... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_verify_not_secure+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12099 "configure"
++#line 13756 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ int
+@@ -12109,36 +13766,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12112: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12115: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12117: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12120: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13769: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_verify_not_secure=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_krb_verify_not_secure=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_krb_verify_not_secure=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-
++	
+ fi
+-echo "$as_me:12131: result: $ac_cv_func_krb_verify_not_secure" >&5
++echo "configure:13779: result: $ac_cv_func_krb_verify_not_secure" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_verify_not_secure" >&6
+ 	if test "$ac_cv_func_krb_verify_not_secure" != yes; then
+-
++		
+ cat >>confdefs.h <<\EOF
+ #define KRB_VERIFY_NOT_SECURE 0
+ EOF
+ 
+ 	fi
++	
+ 
+-echo "$as_me:12141: checking for krb_enable_debug" >&5
++echo "configure:13790: checking for krb_enable_debug" >&5
+ echo $ECHO_N "checking for krb_enable_debug... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_enable_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12154,7 +13803,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12157 "configure"
++#line 13806 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12166,20 +13815,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12169: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12172: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12174: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12177: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13818: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_enable_debug=$ac_lib; else ac_cv_funclib_krb_enable_debug=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -12192,17 +13832,17 @@
+ eval "ac_res=\$ac_cv_funclib_krb_enable_debug"
+ 
+ if false; then
+-
++	
+ for ac_func in krb_enable_debug
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:12199: checking for $ac_func" >&5
++echo "configure:13839: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12205 "configure"
++#line 13845 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12233,25 +13873,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12236: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12239: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12241: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12244: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13876: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12254: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:13885: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12275,13 +13906,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:12278: result: yes" >&5
++	echo "configure:13909: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_enable_debug=no"
+ 	eval "LIB_krb_enable_debug="
+-	echo "$as_me:12284: result: no" >&5
++	echo "configure:13915: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12295,7 +13926,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:12298: result: yes, in $ac_res" >&5
++	echo "configure:13929: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12304,7 +13935,9 @@
+ 	LIBS="$LIB_krb_enable_debug $LIBS"
+ fi
+ 
+-echo "$as_me:12307: checking for krb_disable_debug" >&5
++	
++
++echo "configure:13940: checking for krb_disable_debug" >&5
+ echo $ECHO_N "checking for krb_disable_debug... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_disable_debug+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12320,7 +13953,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12323 "configure"
++#line 13956 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12332,20 +13965,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12335: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12338: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12340: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12343: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:13968: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_disable_debug=$ac_lib; else ac_cv_funclib_krb_disable_debug=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -12358,17 +13982,17 @@
+ eval "ac_res=\$ac_cv_funclib_krb_disable_debug"
+ 
+ if false; then
+-
++	
+ for ac_func in krb_disable_debug
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:12365: checking for $ac_func" >&5
++echo "configure:13989: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12371 "configure"
++#line 13995 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12399,25 +14023,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12402: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12405: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12407: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12410: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:14026: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12420: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14035: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12441,13 +14056,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:12444: result: yes" >&5
++	echo "configure:14059: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_disable_debug=no"
+ 	eval "LIB_krb_disable_debug="
+-	echo "$as_me:12450: result: no" >&5
++	echo "configure:14065: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12461,7 +14076,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:12464: result: yes, in $ac_res" >&5
++	echo "configure:14079: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12470,7 +14085,9 @@
+ 	LIBS="$LIB_krb_disable_debug $LIBS"
+ fi
+ 
+-echo "$as_me:12473: checking for krb_get_our_ip_for_realm" >&5
++	
++
++echo "configure:14090: checking for krb_get_our_ip_for_realm" >&5
+ echo $ECHO_N "checking for krb_get_our_ip_for_realm... $ECHO_C" >&6
+ if test "${ac_cv_funclib_krb_get_our_ip_for_realm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12486,7 +14103,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 12489 "configure"
++#line 14106 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -12498,20 +14115,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12501: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12504: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12506: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12509: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:14118: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_krb_get_our_ip_for_realm=$ac_lib; else ac_cv_funclib_krb_get_our_ip_for_realm=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -12524,17 +14132,17 @@
+ eval "ac_res=\$ac_cv_funclib_krb_get_our_ip_for_realm"
+ 
+ if false; then
+-
++	
+ for ac_func in krb_get_our_ip_for_realm
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:12531: checking for $ac_func" >&5
++echo "configure:14139: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12537 "configure"
++#line 14145 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -12565,25 +14173,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:12568: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12571: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12573: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12576: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:14176: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:12586: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:14185: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -12607,13 +14206,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:12610: result: yes" >&5
++	echo "configure:14209: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_krb_get_our_ip_for_realm=no"
+ 	eval "LIB_krb_get_our_ip_for_realm="
+-	echo "$as_me:12616: result: no" >&5
++	echo "configure:14215: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -12627,7 +14226,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:12630: result: yes, in $ac_res" >&5
++	echo "configure:14229: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -12636,13 +14235,13 @@
+ 	LIBS="$LIB_krb_get_our_ip_for_realm $LIBS"
+ fi
+ 
+-	echo "$as_me:12639: checking for krb_mk_req with const arguments" >&5
++	echo "configure:14238: checking for krb_mk_req with const arguments" >&5
+ echo $ECHO_N "checking for krb_mk_req with const arguments... $ECHO_C" >&6
+ if test "${ac_cv_func_krb_mk_req_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 12645 "configure"
++#line 14244 "configure"
+ #include "confdefs.h"
+ #include <krb.h>
+ 		int krb_mk_req(KTEXT a, const char *s, const char *i,
+@@ -12657,29 +14256,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:12660: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12663: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:12665: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:12668: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:14259: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_func_krb_mk_req_const=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_krb_mk_req_const=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_krb_mk_req_const=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+-
++	
+ fi
+-echo "$as_me:12679: result: $ac_cv_func_krb_mk_req_const" >&5
++echo "configure:14269: result: $ac_cv_func_krb_mk_req_const" >&5
+ echo "${ECHO_T}$ac_cv_func_krb_mk_req_const" >&6
+ 	if test "$ac_cv_func_krb_mk_req_const" = "yes"; then
+-
++		
+ cat >>confdefs.h <<\EOF
+ #define KRB_MK_REQ_CONST 1
+ EOF
+@@ -12689,9 +14279,9 @@
+ 	LIBS="$save_LIBS"
+ 	CFLAGS="$save_CFLAGS"
+ 	LIB_kdb="-lkdb -lkrb"
+-	if test "$krb4_libdir"; then
+-		LIB_krb4="-R $krb4_libdir $LIB_krb4"
+-		LIB_kdb="-R $krb4_libdir -L$krb4_libdir $LIB_kdb"
++	if test "$krb4_libdir" != ""; then
++		LIB_krb4="-rpath $krb4_libdir $LIB_krb4"
++		LIB_kdb="-rpath $krb4_libdir -L$krb4_libdir $LIB_kdb"
+ 	fi
+ fi
+ 
+@@ -12759,15 +14349,13 @@
+ 
+ fi;
+ if test "$enable_kaserver" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define KASERVER 1
+ EOF
+ 
+ 	if test "$with_krb4" = "no"; then
+-		{ { echo "$as_me:12768: error: kaserver requires krb4" >&5
+-echo "$as_me: error: kaserver requires krb4" >&2;}
+-   { (exit 1); exit 1; }; }
++		{ echo "configure: error: kaserver requires krb4" >&2; exit 1; }
+ 		exit 1
+ 	fi
+ fi
+@@ -12778,15 +14366,13 @@
+ 
+ fi;
+ if test "$enable_kaserver_db" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define KASERVER_DB 1
+ EOF
+ 
+ 	if test "$with_krb4" = "no"; then
+-		{ { echo "$as_me:12787: error: kaserver-db requires krb4" >&5
+-echo "$as_me: error: kaserver-db requires krb4" >&2;}
+-   { (exit 1); exit 1; }; }
++		{ echo "configure: error: kaserver-db requires krb4" >&2; exit 1; }
+ 		exit 1
+ 	fi
+ fi
+@@ -12802,7 +14388,7 @@
+ 
+ fi;
+ if test "$otp" = "yes"; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define OTP 1
+ EOF
+@@ -12825,7 +14411,7 @@
+ fi;
+ LIB_security=
+ if test "$enable_osfc2" = yes; then
+-
++	
+ cat >>confdefs.h <<\EOF
+ #define HAVE_OSFC2 1
+ EOF
+@@ -12835,7 +14421,7 @@
+ 
+ # Extract the first word of "nroff", so it can be a program name with args.
+ set dummy nroff; ac_word=$2
+-echo "$as_me:12838: checking for $ac_word" >&5
++echo "configure:14424: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_NROFF+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12850,7 +14436,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  if $as_executable_p "$ac_dir/$ac_word"; then
++  if test -f "$ac_dir/$ac_word"; then
+    ac_cv_path_NROFF="$ac_dir/$ac_word"
+    break
+ fi
+@@ -12862,16 +14448,16 @@
+ NROFF=$ac_cv_path_NROFF
+ 
+ if test -n "$NROFF"; then
+-  echo "$as_me:12865: result: $NROFF" >&5
++  echo "configure:14451: result: $NROFF" >&5
+ echo "${ECHO_T}$NROFF" >&6
+ else
+-  echo "$as_me:12868: result: no" >&5
++  echo "configure:14454: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+ # Extract the first word of "groff", so it can be a program name with args.
+ set dummy groff; ac_word=$2
+-echo "$as_me:12874: checking for $ac_word" >&5
++echo "configure:14460: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_GROFF+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12886,7 +14472,7 @@
+ for ac_dir in $ac_dummy; do
+   IFS=$ac_save_IFS
+   test -z "$ac_dir" && ac_dir=.
+-  if $as_executable_p "$ac_dir/$ac_word"; then
++  if test -f "$ac_dir/$ac_word"; then
+    ac_cv_path_GROFF="$ac_dir/$ac_word"
+    break
+ fi
+@@ -12898,14 +14484,14 @@
+ GROFF=$ac_cv_path_GROFF
+ 
+ if test -n "$GROFF"; then
+-  echo "$as_me:12901: result: $GROFF" >&5
++  echo "configure:14487: result: $GROFF" >&5
+ echo "${ECHO_T}$GROFF" >&6
+ else
+-  echo "$as_me:12904: result: no" >&5
++  echo "configure:14490: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-echo "$as_me:12908: checking how to format man pages" >&5
++echo "configure:14494: checking how to format man pages" >&5
+ echo $ECHO_N "checking how to format man pages... $ECHO_C" >&6
+ if test "${ac_cv_sys_man_format+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -12942,102 +14528,362 @@
+ fi
+ 
+ fi
+-echo "$as_me:12945: result: $ac_cv_sys_man_format" >&5
+-echo "${ECHO_T}$ac_cv_sys_man_format" >&6
+-if test "$ac_cv_sys_man_format"; then
+-	CATMAN="$ac_cv_sys_man_format"
++echo "configure:14531: result: $ac_cv_sys_man_format" >&5
++echo "${ECHO_T}$ac_cv_sys_man_format" >&6
++if test "$ac_cv_sys_man_format"; then
++	CATMAN="$ac_cv_sys_man_format"
++	
++fi
++
++if test "$CATMAN"; then
++  CATMAN_TRUE=
++  CATMAN_FALSE='#'
++else
++  CATMAN_TRUE='#'
++  CATMAN_FALSE=
++fi
++echo "configure:14545: checking extension of pre-formatted manual pages" >&5
++echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
++if test "${ac_cv_sys_catman_ext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
++	ac_cv_sys_catman_ext=0
++else
++	ac_cv_sys_catman_ext=number
++fi
++
++fi
++echo "configure:14557: result: $ac_cv_sys_catman_ext" >&5
++echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
++if test "$ac_cv_sys_catman_ext" = number; then
++	CATMANEXT='$$section'
++else
++	CATMANEXT=0
++fi
++
++# Check whether --with-readline or --without-readline was given.
++if test "${with_readline+set}" = set; then
++  withval="$with_readline"
++
++fi;
++
++# Check whether --with-readline-lib or --without-readline-lib was given.
++if test "${with_readline_lib+set}" = set; then
++  withval="$with_readline_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-readline-lib" >&2; exit 1; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi;
++
++# Check whether --with-readline-include or --without-readline-include was given.
++if test "${with_readline_include+set}" = set; then
++  withval="$with_readline_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-readline-include" >&2; exit 1; }
++elif test "X$with_readline" = "X"; then
++  with_readline=yes
++fi
++fi;
++
++echo "configure:14591: checking for readline" >&5
++echo $ECHO_N "checking for readline... $ECHO_C" >&6
++
++case "$with_readline" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_readline_include" = ""; then
++		with_readline_include="$with_readline/include"
++	fi
++	if test "$with_readline_lib" = ""; then
++		with_readline_lib="$with_readline/lib$abilibdirext"
++	fi
++	;;
++esac
++header_dirs=
++lib_dirs=
++d=''
++for i in $d /usr; do
++	header_dirs="$header_dirs $i/include"
++	lib_dirs="$lib_dirs $i/lib$abilibdirext"
++done
++
++case "$with_readline_include" in
++yes) ;;
++no)  ;;
++*)   header_dirs="$with_readline_include $header_dirs";;
++esac
++case "$with_readline_lib" in
++yes) ;;
++no)  ;;
++*)   lib_dirs="$with_readline_lib $lib_dirs";;
++esac
++
++save_CFLAGS="$CFLAGS"
++save_LIBS="$LIBS"
++ires= lres=
++for i in $header_dirs; do
++	CFLAGS="-I$i $save_CFLAGS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 14631 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:14644: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ires=$i;break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++for i in $lib_dirs; do
++	LIBS="-L$i -lreadline  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 14655 "configure"
++#include "confdefs.h"
++#include <stdio.h>
++ #include <readline.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14668: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lres=$i;break
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++done
++CFLAGS="$save_CFLAGS"
++LIBS="$save_LIBS"
++
++if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
++	readline_includedir="$ires"
++	readline_libdir="$lres"
++	DIR_readline=
++	INCLUDE_readline="-I$readline_includedir"
++	LIB_readline="-L$readline_libdir -lreadline"
++	
++	with_readline=yes
++	echo "configure:14687: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
++else
++	DIR_readline="readline"
++	INCLUDE_readline=
++	LIB_readline=
++	with_readline=no
++	echo "configure:14694: result: $with_readline" >&5
++echo "${ECHO_T}$with_readline" >&6
++fi
++
++# Check whether --with-com_err or --without-com_err was given.
++if test "${with_com_err+set}" = set; then
++  withval="$with_com_err"
++
++fi;
++
++# Check whether --with-com_err-lib or --without-com_err-lib was given.
++if test "${with_com_err_lib+set}" = set; then
++  withval="$with_com_err_lib"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-com_err-lib" >&2; exit 1; }
++elif test "X$with_com_err" = "X"; then
++  with_com_err=yes
++fi
++fi;
+ 
++# Check whether --with-com_err-include or --without-com_err-include was given.
++if test "${with_com_err_include+set}" = set; then
++  withval="$with_com_err_include"
++  if test "$withval" = "yes" -o "$withval" = "no"; then
++  { echo "configure: error: No argument for --with-com_err-include" >&2; exit 1; }
++elif test "X$with_com_err" = "X"; then
++  with_com_err=yes
+ fi
++fi;
+ 
+-if test "$CATMAN"; then
+-  CATMAN_TRUE=
+-  CATMAN_FALSE='#'
++echo "configure:14724: checking for com_err" >&5
++echo $ECHO_N "checking for com_err... $ECHO_C" >&6
++
++case "$with_com_err" in
++yes)	;;
++no)	;;
++"")	;;
++*)	if test "$with_com_err_include" = ""; then
++		with_com_err_include="$with_com_err/include"
++	fi
++	if test "$with_com_err_lib" = ""; then
++		with_com_err_lib="$with_com_err/lib$abilibdirext"
++	fi
++	;;
++esac
++header_dirs=
++lib_dirs=
++d=''
++for i in $d /usr; do
++	header_dirs="$header_dirs $i/include"
++	lib_dirs="$lib_dirs $i/lib$abilibdirext"
++done
++
++case "$with_com_err_include" in
++yes) ;;
++no)  ;;
++*)   header_dirs="$with_com_err_include $header_dirs";;
++esac
++case "$with_com_err_lib" in
++yes) ;;
++no)  ;;
++*)   lib_dirs="$with_com_err_lib $lib_dirs";;
++esac
++
++save_CFLAGS="$CFLAGS"
++save_LIBS="$LIBS"
++ires= lres=
++for i in $header_dirs; do
++	CFLAGS="-I$i $save_CFLAGS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 14764 "configure"
++#include "confdefs.h"
++#include <et/com_err.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo configure:14776: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
++  ires=$i;break
+ else
+-  CATMAN_TRUE='#'
+-  CATMAN_FALSE=
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+-echo "$as_me:12959: checking extension of pre-formatted manual pages" >&5
+-echo $ECHO_N "checking extension of pre-formatted manual pages... $ECHO_C" >&6
+-if test "${ac_cv_sys_catman_ext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if grep _suffix /etc/man.conf > /dev/null 2>&1; then
+-	ac_cv_sys_catman_ext=0
++rm -f conftest.$ac_objext conftest.$ac_ext
++done
++for i in $lib_dirs; do
++	LIBS="-L$i -lcom_err  $save_LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line 14787 "configure"
++#include "confdefs.h"
++#include <et/com_err.h>
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:14799: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
++  lres=$i;break
+ else
+-	ac_cv_sys_catman_ext=number
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
++rm -f conftest$ac_exeext conftest.$ac_ext
++done
++CFLAGS="$save_CFLAGS"
++LIBS="$save_LIBS"
+ 
+-fi
+-echo "$as_me:12971: result: $ac_cv_sys_catman_ext" >&5
+-echo "${ECHO_T}$ac_cv_sys_catman_ext" >&6
+-if test "$ac_cv_sys_catman_ext" = number; then
+-	CATMANEXT='$$section'
++if test "$ires" -a "$lres" -a "$with_com_err" != "no"; then
++	com_err_includedir="$ires"
++	com_err_libdir="$lres"
++	DIR_com_err=
++	INCLUDE_com_err="-I$com_err_includedir"
++	LIB_com_err="-L$com_err_libdir -lcom_err"
++	
++	with_com_err=yes
++	echo "configure:14818: result: headers $ires, libraries $lres" >&5
++echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
+-	CATMANEXT=0
++	DIR_com_err="com_err"
++	INCLUDE_com_err=
++	LIB_com_err=
++	with_com_err=no
++	echo "configure:14825: result: $with_com_err" >&5
++echo "${ECHO_T}$with_com_err" >&6
+ fi
+ 
+-# Check whether --with-readline or --without-readline was given.
+-if test "${with_readline+set}" = set; then
+-  withval="$with_readline"
++# Check whether --with-ss or --without-ss was given.
++if test "${with_ss+set}" = set; then
++  withval="$with_ss"
+ 
+ fi;
+ 
+-# Check whether --with-readline-lib or --without-readline-lib was given.
+-if test "${with_readline_lib+set}" = set; then
+-  withval="$with_readline_lib"
++# Check whether --with-ss-lib or --without-ss-lib was given.
++if test "${with_ss_lib+set}" = set; then
++  withval="$with_ss_lib"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:12989: error: No argument for --with-readline-lib" >&5
+-echo "$as_me: error: No argument for --with-readline-lib" >&2;}
+-   { (exit 1); exit 1; }; }
+-elif test "X$with_readline" = "X"; then
+-  with_readline=yes
++  { echo "configure: error: No argument for --with-ss-lib" >&2; exit 1; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
+ fi
+ fi;
+ 
+-# Check whether --with-readline-include or --without-readline-include was given.
+-if test "${with_readline_include+set}" = set; then
+-  withval="$with_readline_include"
++# Check whether --with-ss-include or --without-ss-include was given.
++if test "${with_ss_include+set}" = set; then
++  withval="$with_ss_include"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:13001: error: No argument for --with-readline-include" >&5
+-echo "$as_me: error: No argument for --with-readline-include" >&2;}
+-   { (exit 1); exit 1; }; }
+-elif test "X$with_readline" = "X"; then
+-  with_readline=yes
++  { echo "configure: error: No argument for --with-ss-include" >&2; exit 1; }
++elif test "X$with_ss" = "X"; then
++  with_ss=yes
+ fi
+ fi;
+ 
+-echo "$as_me:13009: checking for readline" >&5
+-echo $ECHO_N "checking for readline... $ECHO_C" >&6
++echo "configure:14855: checking for ss" >&5
++echo $ECHO_N "checking for ss... $ECHO_C" >&6
+ 
+-case "$with_readline" in
++case "$with_ss" in
+ yes)	;;
+ no)	;;
+ "")	;;
+-*)	if test "$with_readline_include" = ""; then
+-		with_readline_include="$with_readline/include"
++*)	if test "$with_ss_include" = ""; then
++		with_ss_include="$with_ss/include"
+ 	fi
+-	if test "$with_readline_lib" = ""; then
+-		with_readline_lib="$with_readline/lib$abilibdirext"
++	if test "$with_ss_lib" = ""; then
++		with_ss_lib="$with_ss/lib$abilibdirext"
+ 	fi
+ 	;;
+ esac
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+ 
+-case "$with_readline_include" in
++case "$with_ss_include" in
+ yes) ;;
+ no)  ;;
+-*)   header_dirs="$with_readline_include $header_dirs";;
++*)   header_dirs="$with_ss_include $header_dirs";;
+ esac
+-case "$with_readline_lib" in
++case "$with_ss_lib" in
+ yes) ;;
+ no)  ;;
+-*)   lib_dirs="$with_readline_lib $lib_dirs";;
++*)   lib_dirs="$with_ss_lib $lib_dirs";;
+ esac
+ 
+ save_CFLAGS="$CFLAGS"
+@@ -13046,10 +14892,9 @@
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13049 "configure"
++#line 14895 "configure"
+ #include "confdefs.h"
+-#include <stdio.h>
+- #include <readline.h>
++#include <ss.h>
+ int
+ main ()
+ {
+@@ -13059,30 +14904,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13062: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13065: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13067: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13070: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:14907: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+-	LIBS="-L$i -lreadline  $save_LIBS"
++	LIBS="-L$i -lss  $save_LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13082 "configure"
++#line 14918 "configure"
+ #include "confdefs.h"
+-#include <stdio.h>
+- #include <readline.h>
++#include <ss.h>
+ int
+ main ()
+ {
+@@ -13092,45 +14927,34 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13095: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13098: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13100: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13103: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:14930: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ 
+-if test "$ires" -a "$lres" -a "$with_readline" != "no"; then
+-	readline_includedir="$ires"
+-	readline_libdir="$lres"
+-	INCLUDE_readline="-I$readline_includedir"
+-	LIB_readline="-L$readline_libdir -lreadline"
+-
+-cat >>confdefs.h <<EOF
+-#define READLINE 1
+-EOF
+-
+-	with_readline=yes
+-	echo "$as_me:13126: result: headers $ires, libraries $lres" >&5
++if test "$ires" -a "$lres" -a "$with_ss" != "no"; then
++	ss_includedir="$ires"
++	ss_libdir="$lres"
++	DIR_ss=
++	INCLUDE_ss="-I$ss_includedir"
++	LIB_ss="-L$ss_libdir -lss"
++	
++	with_ss=yes
++	echo "configure:14949: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
+-	INCLUDE_readline=
+-	LIB_readline=
+-	with_readline=no
+-	echo "$as_me:13132: result: $with_readline" >&5
+-echo "${ECHO_T}$with_readline" >&6
++	DIR_ss="ss"
++	INCLUDE_ss=
++	LIB_ss=
++	with_ss=no
++	echo "configure:14956: result: $with_ss" >&5
++echo "${ECHO_T}$with_ss" >&6
+ fi
+ 
+ # Check whether --with-hesiod or --without-hesiod was given.
+@@ -13143,9 +14967,7 @@
+ if test "${with_hesiod_lib+set}" = set; then
+   withval="$with_hesiod_lib"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:13146: error: No argument for --with-hesiod-lib" >&5
+-echo "$as_me: error: No argument for --with-hesiod-lib" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: No argument for --with-hesiod-lib" >&2; exit 1; }
+ elif test "X$with_hesiod" = "X"; then
+   with_hesiod=yes
+ fi
+@@ -13155,15 +14977,13 @@
+ if test "${with_hesiod_include+set}" = set; then
+   withval="$with_hesiod_include"
+   if test "$withval" = "yes" -o "$withval" = "no"; then
+-  { { echo "$as_me:13158: error: No argument for --with-hesiod-include" >&5
+-echo "$as_me: error: No argument for --with-hesiod-include" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: No argument for --with-hesiod-include" >&2; exit 1; }
+ elif test "X$with_hesiod" = "X"; then
+   with_hesiod=yes
+ fi
+ fi;
+ 
+-echo "$as_me:13166: checking for hesiod" >&5
++echo "configure:14986: checking for hesiod" >&5
+ echo $ECHO_N "checking for hesiod... $ECHO_C" >&6
+ 
+ case "$with_hesiod" in
+@@ -13181,7 +15001,7 @@
+ header_dirs=
+ lib_dirs=
+ d=''
+-for i in $d; do
++for i in $d /usr; do
+ 	header_dirs="$header_dirs $i/include"
+ 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
+ done
+@@ -13203,7 +15023,7 @@
+ for i in $header_dirs; do
+ 	CFLAGS="-I$i $save_CFLAGS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13206 "configure"
++#line 15026 "configure"
+ #include "confdefs.h"
+ #include <hesiod.h>
+ int
+@@ -13215,27 +15035,18 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13218: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13221: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13223: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13226: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15038: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ires=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ for i in $lib_dirs; do
+ 	LIBS="-L$i -lhesiod  $save_LIBS"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line 13238 "configure"
++#line 15049 "configure"
+ #include "confdefs.h"
+ #include <hesiod.h>
+ int
+@@ -13247,20 +15058,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13250: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13253: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13255: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13258: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15061: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   lres=$i;break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ done
+@@ -13270,21 +15072,19 @@
+ if test "$ires" -a "$lres" -a "$with_hesiod" != "no"; then
+ 	hesiod_includedir="$ires"
+ 	hesiod_libdir="$lres"
++	DIR_hesiod=
+ 	INCLUDE_hesiod="-I$hesiod_includedir"
+ 	LIB_hesiod="-L$hesiod_libdir -lhesiod"
+-
+-cat >>confdefs.h <<EOF
+-#define HESIOD 1
+-EOF
+-
++	
+ 	with_hesiod=yes
+-	echo "$as_me:13281: result: headers $ires, libraries $lres" >&5
++	echo "configure:15080: result: headers $ires, libraries $lres" >&5
+ echo "${ECHO_T}headers $ires, libraries $lres" >&6
+ else
++	DIR_hesiod="hesiod"
+ 	INCLUDE_hesiod=
+ 	LIB_hesiod=
+ 	with_hesiod=no
+-	echo "$as_me:13287: result: $with_hesiod" >&5
++	echo "configure:15087: result: $with_hesiod" >&5
+ echo "${ECHO_T}$with_hesiod" >&6
+ fi
+ 
+@@ -13298,13 +15098,13 @@
+   enableval="$enable_littleendian"
+   krb_cv_c_bigendian=no
+ fi;
+-echo "$as_me:13301: checking whether byte order is known at compile time" >&5
++echo "configure:15101: checking whether byte order is known at compile time" >&5
+ echo $ECHO_N "checking whether byte order is known at compile time... $ECHO_C" >&6
+ if test "${krb_cv_c_bigendian_compile+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13307 "configure"
++#line 15107 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13321,27 +15121,18 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13324: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13327: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13329: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13332: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15124: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   krb_cv_c_bigendian_compile=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-krb_cv_c_bigendian_compile=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  krb_cv_c_bigendian_compile=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:13342: result: $krb_cv_c_bigendian_compile" >&5
++echo "configure:15133: result: $krb_cv_c_bigendian_compile" >&5
+ echo "${ECHO_T}$krb_cv_c_bigendian_compile" >&6
+-echo "$as_me:13344: checking whether byte ordering is bigendian" >&5
++echo "configure:15135: checking whether byte ordering is bigendian" >&5
+ echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+ if test "${krb_cv_c_bigendian+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13349,7 +15140,7 @@
+ 
+   if test "$krb_cv_c_bigendian_compile" = "yes"; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line 13352 "configure"
++#line 15143 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -13366,31 +15157,20 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13369: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13372: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13374: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13377: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15160: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   krb_cv_c_bigendian=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-krb_cv_c_bigendian=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  krb_cv_c_bigendian=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+   else
+     if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:13388: error: specify either --enable-bigendian or --enable-littleendian" >&5
+-echo "$as_me: error: specify either --enable-bigendian or --enable-littleendian" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: specify either --enable-bigendian or --enable-littleendian" >&2; exit 1; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13393 "configure"
++#line 15173 "configure"
+ #include "confdefs.h"
+ main () {
+       /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -13404,28 +15184,21 @@
+   }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:13407: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13410: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:13411: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13414: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15187: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   krb_cv_c_bigendian=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-krb_cv_c_bigendian=yes
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  krb_cv_c_bigendian=yes
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+   fi
+ 
+ fi
+-echo "$as_me:13428: result: $krb_cv_c_bigendian" >&5
++echo "configure:15201: result: $krb_cv_c_bigendian" >&5
+ echo "${ECHO_T}$krb_cv_c_bigendian" >&6
+ if test "$krb_cv_c_bigendian" = "yes"; then
+ 
+@@ -13440,7 +15213,7 @@
+ EOF
+ fi
+ 
+-echo "$as_me:13443: checking for inline" >&5
++echo "configure:15216: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13448,7 +15221,7 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13451 "configure"
++#line 15224 "configure"
+ #include "confdefs.h"
+ #ifndef __cplusplus
+ $ac_kw int foo () {return 0; }
+@@ -13456,26 +15229,17 @@
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:13459: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13462: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13464: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13467: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15232: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_inline=$ac_kw; break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+-echo "$as_me:13478: result: $ac_cv_c_inline" >&5
++echo "configure:15242: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+@@ -13525,7 +15289,7 @@
+   AIX_DYNAMIC_AFS_FALSE=
+ fi
+ 
+-echo "$as_me:13528: checking for dlopen" >&5
++echo "configure:15292: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
+ if test "${ac_cv_funclib_dlopen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -13541,7 +15305,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 13544 "configure"
++#line 15308 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -13553,20 +15317,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13556: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13559: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13561: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13564: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15320: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_dlopen=$ac_lib; else ac_cv_funclib_dlopen=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -13579,17 +15334,17 @@
+ eval "ac_res=\$ac_cv_funclib_dlopen"
+ 
+ if false; then
+-
++	
+ for ac_func in dlopen
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:13586: checking for $ac_func" >&5
++echo "configure:15341: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13592 "configure"
++#line 15347 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -13620,25 +15375,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13626: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13628: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13631: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15378: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:13641: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:15387: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -13662,13 +15408,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:13665: result: yes" >&5
++	echo "configure:15411: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_dlopen=no"
+ 	eval "LIB_dlopen="
+-	echo "$as_me:13671: result: no" >&5
++	echo "configure:15417: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -13682,7 +15428,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:13685: result: yes, in $ac_res" >&5
++	echo "configure:15431: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -13722,7 +15468,7 @@
+   IRIX_FALSE=
+ fi
+ 
+-echo "$as_me:13725: checking for X" >&5
++echo "configure:15471: checking for X" >&5
+ echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -13739,7 +15485,7 @@
+     # Both variables are already set.
+     have_x=yes
+   else
+-    if test "${ac_cv_have_x+set}" = set; then
++if test "${ac_cv_have_x+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # One or both of the vars are not set, and there is no cached value.
+@@ -13819,19 +15565,13 @@
+   # Guess where to find include files, by looking for Intrinsic.h.
+   # First, try using that file with no special directory specified.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13822 "configure"
++#line 15568 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ _ACEOF
+-if { (eval echo "$as_me:13826: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:13832: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:15573: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -13839,11 +15579,13 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   for ac_dir in $ac_x_header_dirs; do
+   if test -r "$ac_dir/X11/Intrinsic.h"; then
+@@ -13852,7 +15594,8 @@
+   fi
+ done
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi # $ac_x_includes = no
+ 
+ if test "$ac_x_libraries" = no; then
+@@ -13862,7 +15605,7 @@
+   ac_save_LIBS=$LIBS
+   LIBS="-lXt $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 13865 "configure"
++#line 15608 "configure"
+ #include "confdefs.h"
+ #include <X11/Intrinsic.h>
+ int
+@@ -13874,23 +15617,14 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13877: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13880: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13882: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13885: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15620: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-LIBS=$ac_save_LIBS
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  LIBS=$ac_save_LIBS
+ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+   # Don't even attempt the hair of trying to link an X program!
+@@ -13914,13 +15648,12 @@
+ 	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+ fi
+ fi
+-
+   fi
+   eval "$ac_cv_have_x"
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  echo "$as_me:13923: result: $have_x" >&5
++  echo "configure:15656: result: $have_x" >&5
+ echo "${ECHO_T}$have_x" >&6
+   no_x=yes
+ else
+@@ -13930,7 +15663,7 @@
+   # Update the cache value to reflect the command line values.
+   ac_cv_have_x="have_x=yes \
+ 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+-  echo "$as_me:13933: result: libraries $x_libraries, headers $x_includes" >&5
++  echo "configure:15666: result: libraries $x_libraries, headers $x_includes" >&5
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
+@@ -13954,81 +15687,39 @@
+     # others require no space.  Words are not sufficient . . . .
+     case `(uname -sr) 2>/dev/null` in
+     "SunOS 5"*)
+-      echo "$as_me:13957: checking whether -R must be followed by a space" >&5
++      echo "configure:15690: checking whether -R must be followed by a space" >&5
+ echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+-      cat >conftest.$ac_ext <<_ACEOF
+-#line 13961 "configure"
+-#include "confdefs.h"
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:13973: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13976: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:13978: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:13981: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++      rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15694: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_R_nospace=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_R_nospace=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_R_nospace=no
+ fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
++rm -f conftest$ac_exeext
+       if test $ac_R_nospace = yes; then
+-	echo "$as_me:13991: result: no" >&5
++	echo "configure:15703: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	X_LIBS="$X_LIBS -R$x_libraries"
+       else
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+-	cat >conftest.$ac_ext <<_ACEOF
+-#line 13997 "configure"
+-#include "confdefs.h"
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14009: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14012: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14014: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14017: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++	rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo configure:15709: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_R_space=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_R_space=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_R_space=no
+ fi
+-rm -f conftest$ac_exeext conftest.$ac_ext
++rm -f conftest$ac_exeext
+ 	if test $ac_R_space = yes; then
+-	  echo "$as_me:14027: result: yes" >&5
++	  echo "configure:15718: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ 	else
+-	  echo "$as_me:14031: result: neither works" >&5
++	  echo "configure:15722: result: neither works" >&5
+ echo "${ECHO_T}neither works" >&6
+ 	fi
+       fi
+@@ -14046,7 +15737,8 @@
+     # Martyn Johnson says this is needed for Ultrix, if the X
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+-    echo "$as_me:14049: checking for dnet_ntoa in -ldnet" >&5
++
++echo "configure:15741: checking for dnet_ntoa in -ldnet" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14054,7 +15746,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14057 "configure"
++#line 15749 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14073,33 +15765,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14076: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14079: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14081: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14084: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15768: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_dnet_dnet_ntoa=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14095: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++echo "configure:15778: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      echo "$as_me:14102: checking for dnet_ntoa in -ldnet_stub" >&5
++
++echo "configure:15786: checking for dnet_ntoa in -ldnet_stub" >&5
+ echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+ if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14107,7 +15791,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14110 "configure"
++#line 15794 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14126,26 +15810,17 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14129: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14132: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14134: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14137: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15813: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_dnet_stub_dnet_ntoa=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14148: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++echo "configure:15823: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+ if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+@@ -14161,13 +15836,13 @@
+     # on Irix 5.2, according to T.E. Dickey.
+     # The functions gethostbyname, getservbyname, and inet_addr are
+     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+-    echo "$as_me:14164: checking for gethostbyname" >&5
++    echo "configure:15839: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_func_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14170 "configure"
++#line 15845 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gethostbyname (); below.  */
+@@ -14198,29 +15873,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14201: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14204: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14206: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14209: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15876: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_gethostbyname=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_gethostbyname=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_gethostbyname=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14219: result: $ac_cv_func_gethostbyname" >&5
++echo "configure:15885: result: $ac_cv_func_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      echo "$as_me:14223: checking for gethostbyname in -lnsl" >&5
++
++echo "configure:15890: checking for gethostbyname in -lnsl" >&5
+ echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14228,7 +15895,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14231 "configure"
++#line 15898 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14247,33 +15914,25 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14250: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14253: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14255: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14258: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15917: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_nsl_gethostbyname=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_nsl_gethostbyname=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14269: result: $ac_cv_lib_nsl_gethostbyname" >&5
++echo "configure:15927: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+ if test $ac_cv_lib_nsl_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-        echo "$as_me:14276: checking for gethostbyname in -lbsd" >&5
++
++echo "configure:15935: checking for gethostbyname in -lbsd" >&5
+ echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+ if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14281,7 +15940,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14284 "configure"
++#line 15943 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14300,26 +15959,17 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14303: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14306: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14308: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14311: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:15962: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_bsd_gethostbyname=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_bsd_gethostbyname=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14322: result: $ac_cv_lib_bsd_gethostbyname" >&5
++echo "configure:15972: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+ if test $ac_cv_lib_bsd_gethostbyname = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+@@ -14335,13 +15985,13 @@
+     # variants that don't use the nameserver (or something).  -lsocket
+     # must be given before -lnsl if both are needed.  We assume that
+     # if connect needs -lnsl, so does gethostbyname.
+-    echo "$as_me:14338: checking for connect" >&5
++    echo "configure:15988: checking for connect" >&5
+ echo $ECHO_N "checking for connect... $ECHO_C" >&6
+ if test "${ac_cv_func_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14344 "configure"
++#line 15994 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char connect (); below.  */
+@@ -14372,29 +16022,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14375: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14378: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14380: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14383: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16025: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_connect=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_connect=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_connect=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14393: result: $ac_cv_func_connect" >&5
++echo "configure:16034: result: $ac_cv_func_connect" >&5
+ echo "${ECHO_T}$ac_cv_func_connect" >&6
+ 
+     if test $ac_cv_func_connect = no; then
+-      echo "$as_me:14397: checking for connect in -lsocket" >&5
++
++echo "configure:16039: checking for connect in -lsocket" >&5
+ echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+ if test "${ac_cv_lib_socket_connect+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14402,7 +16044,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14405 "configure"
++#line 16047 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14421,26 +16063,17 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14424: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14427: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14429: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14432: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16066: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_socket_connect=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_socket_connect=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_socket_connect=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14443: result: $ac_cv_lib_socket_connect" >&5
++echo "configure:16076: result: $ac_cv_lib_socket_connect" >&5
+ echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+ if test $ac_cv_lib_socket_connect = yes; then
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+@@ -14449,13 +16082,13 @@
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    echo "$as_me:14452: checking for remove" >&5
++    echo "configure:16085: checking for remove" >&5
+ echo $ECHO_N "checking for remove... $ECHO_C" >&6
+ if test "${ac_cv_func_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14458 "configure"
++#line 16091 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char remove (); below.  */
+@@ -14486,29 +16119,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14489: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14492: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14494: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14497: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16122: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_remove=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_remove=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_remove=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14507: result: $ac_cv_func_remove" >&5
++echo "configure:16131: result: $ac_cv_func_remove" >&5
+ echo "${ECHO_T}$ac_cv_func_remove" >&6
+ 
+     if test $ac_cv_func_remove = no; then
+-      echo "$as_me:14511: checking for remove in -lposix" >&5
++
++echo "configure:16136: checking for remove in -lposix" >&5
+ echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix_remove+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14516,7 +16141,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14519 "configure"
++#line 16144 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14535,26 +16160,17 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14538: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14541: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14543: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14546: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16163: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_posix_remove=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_posix_remove=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_posix_remove=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14557: result: $ac_cv_lib_posix_remove" >&5
++echo "configure:16173: result: $ac_cv_lib_posix_remove" >&5
+ echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+ if test $ac_cv_lib_posix_remove = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+@@ -14563,13 +16179,13 @@
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    echo "$as_me:14566: checking for shmat" >&5
++    echo "configure:16182: checking for shmat" >&5
+ echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+ if test "${ac_cv_func_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14572 "configure"
++#line 16188 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char shmat (); below.  */
+@@ -14600,29 +16216,21 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14603: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14606: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14608: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14611: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16219: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_func_shmat=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_func_shmat=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_func_shmat=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14621: result: $ac_cv_func_shmat" >&5
++echo "configure:16228: result: $ac_cv_func_shmat" >&5
+ echo "${ECHO_T}$ac_cv_func_shmat" >&6
+ 
+     if test $ac_cv_func_shmat = no; then
+-      echo "$as_me:14625: checking for shmat in -lipc" >&5
++
++echo "configure:16233: checking for shmat in -lipc" >&5
+ echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+ if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14630,7 +16238,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14633 "configure"
++#line 16241 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14649,26 +16257,17 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14652: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14655: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14657: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14660: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16260: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipc_shmat=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_ipc_shmat=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_ipc_shmat=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14671: result: $ac_cv_lib_ipc_shmat" >&5
++echo "configure:16270: result: $ac_cv_lib_ipc_shmat" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+ if test $ac_cv_lib_ipc_shmat = yes; then
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+@@ -14686,7 +16285,8 @@
+   # These have to be linked with before -lX11, unlike the other
+   # libraries we check for below, so use a different variable.
+   # John Interrante, Karl Berry
+-  echo "$as_me:14689: checking for IceConnectionNumber in -lICE" >&5
++
++echo "configure:16289: checking for IceConnectionNumber in -lICE" >&5
+ echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+ if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14694,7 +16294,7 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 14697 "configure"
++#line 16297 "configure"
+ #include "confdefs.h"
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -14713,26 +16313,17 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14716: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14719: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14721: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14724: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16316: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_ICE_IceConnectionNumber=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:14735: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++echo "configure:16326: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+ if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+@@ -14745,7 +16336,7 @@
+ # try to figure out if we need any additional ld flags, like -R
+ # and yes, the autoconf X test is utterly broken
+ if test "$no_x" != yes; then
+-	echo "$as_me:14748: checking for special X linker flags" >&5
++	echo "configure:16339: checking for special X linker flags" >&5
+ echo $ECHO_N "checking for special X linker flags... $ECHO_C" >&6
+ if test "${krb_cv_sys_x_libs_rpath+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14774,12 +16365,10 @@
+ 		fi
+ 		LIBS="$ac_save_libs $foo $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+ 		if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:14777: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+-   { (exit 1); exit 1; }; }
++  { echo "configure: error: cannot run test program while cross compiling" >&2; exit 1; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14782 "configure"
++#line 16371 "configure"
+ #include "confdefs.h"
+ 
+ 		#include <X11/Xlib.h>
+@@ -14791,33 +16380,26 @@
+ 		{
+ 		return 0;
+ 		}
+-
++		
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:14797: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14800: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:14801: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14804: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16386: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   krb_cv_sys_x_libs_rpath="$rflag"; krb_cv_sys_x_libs="$foo"; break
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-:
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  :
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+ 	done
+ 	LIBS="$ac_save_libs"
+ 	CFLAGS="$ac_save_cflags"
+-
++	
+ fi
+-echo "$as_me:14820: result: $krb_cv_sys_x_libs_rpath" >&5
++echo "configure:16402: result: $krb_cv_sys_x_libs_rpath" >&5
+ echo "${ECHO_T}$krb_cv_sys_x_libs_rpath" >&6
+ 	X_LIBS="$krb_cv_sys_x_libs"
+ fi
+@@ -14837,7 +16419,7 @@
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $X_LIBS"
+ 
+-echo "$as_me:14840: checking for XauWriteAuth" >&5
++echo "configure:16422: checking for XauWriteAuth" >&5
+ echo $ECHO_N "checking for XauWriteAuth... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauWriteAuth+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -14853,7 +16435,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 14856 "configure"
++#line 16438 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -14865,20 +16447,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14868: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14871: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14873: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14876: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16450: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauWriteAuth=$ac_lib; else ac_cv_funclib_XauWriteAuth=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -14891,17 +16464,17 @@
+ eval "ac_res=\$ac_cv_funclib_XauWriteAuth"
+ 
+ if false; then
+-
++	
+ for ac_func in XauWriteAuth
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:14898: checking for $ac_func" >&5
++echo "configure:16471: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 14904 "configure"
++#line 16477 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -14932,25 +16505,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:14935: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14938: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:14940: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:14943: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16508: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:14953: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16517: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -14974,13 +16538,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:14977: result: yes" >&5
++	echo "configure:16541: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauWriteAuth=no"
+ 	eval "LIB_XauWriteAuth="
+-	echo "$as_me:14983: result: no" >&5
++	echo "configure:16547: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -14994,7 +16558,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:14997: result: yes, in $ac_res" >&5
++	echo "configure:16561: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -15002,7 +16566,7 @@
+ ac_xxx="$LIBS"
+ LIBS="$LIB_XauWriteAuth $LIBS"
+ 
+-echo "$as_me:15005: checking for XauReadAuth" >&5
++echo "configure:16569: checking for XauReadAuth" >&5
+ echo $ECHO_N "checking for XauReadAuth... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauReadAuth+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15018,7 +16582,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15021 "configure"
++#line 16585 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15030,20 +16594,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15033: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15036: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15038: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15041: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16597: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauReadAuth=$ac_lib; else ac_cv_funclib_XauReadAuth=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -15056,17 +16611,17 @@
+ eval "ac_res=\$ac_cv_funclib_XauReadAuth"
+ 
+ if false; then
+-
++	
+ for ac_func in XauReadAuth
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:15063: checking for $ac_func" >&5
++echo "configure:16618: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15069 "configure"
++#line 16624 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15097,25 +16652,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15100: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15103: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15105: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15108: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16655: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15118: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16664: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15139,13 +16685,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:15142: result: yes" >&5
++	echo "configure:16688: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauReadAuth=no"
+ 	eval "LIB_XauReadAuth="
+-	echo "$as_me:15148: result: no" >&5
++	echo "configure:16694: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15159,14 +16705,14 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:15162: result: yes, in $ac_res" >&5
++	echo "configure:16708: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+ 
+ LIBS="$LIB_XauReadAauth $LIBS"
+ 
+-echo "$as_me:15169: checking for XauFileName" >&5
++echo "configure:16715: checking for XauFileName" >&5
+ echo $ECHO_N "checking for XauFileName... $ECHO_C" >&6
+ if test "${ac_cv_funclib_XauFileName+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15182,7 +16728,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 15185 "configure"
++#line 16731 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15194,20 +16740,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15197: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15200: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15202: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15205: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16743: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_XauFileName=$ac_lib; else ac_cv_funclib_XauFileName=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -15220,17 +16757,17 @@
+ eval "ac_res=\$ac_cv_funclib_XauFileName"
+ 
+ if false; then
+-
++	
+ for ac_func in XauFileName
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:15227: checking for $ac_func" >&5
++echo "configure:16764: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15233 "configure"
++#line 16770 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -15261,25 +16798,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15267: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15269: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15272: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16801: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15282: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:16810: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -15303,13 +16831,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:15306: result: yes" >&5
++	echo "configure:16834: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_XauFileName=no"
+ 	eval "LIB_XauFileName="
+-	echo "$as_me:15312: result: no" >&5
++	echo "configure:16840: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -15323,7 +16851,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:15326: result: yes, in $ac_res" >&5
++	echo "configure:16854: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -15350,6 +16878,7 @@
+ esac
+ 
+ if test "$AUTOMAKE" != ""; then
++	
+ 
+ if test "$ac_cv_func_XauWriteAuth" != "yes"; then
+   NEED_WRITEAUTH_TRUE=
+@@ -15359,7 +16888,8 @@
+   NEED_WRITEAUTH_FALSE=
+ fi
+ else
+-
++	
++	
+ 	if test "$ac_cv_func_XauWriteAuth" != "yes"; then
+ 		NEED_WRITEAUTH_TRUE=
+ 		NEED_WRITEAUTH_FALSE='#'
+@@ -15372,13 +16902,13 @@
+ LIBS=$save_LIBS
+ LDFLAGS=$save_LDFLAGS
+ 
+-echo "$as_me:15375: checking for an ANSI C-conforming const" >&5
++echo "configure:16905: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15381 "configure"
++#line 16911 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -15436,25 +16966,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15439: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15442: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15444: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15447: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:16969: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_c_const=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_c_const=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15457: result: $ac_cv_c_const" >&5
++echo "configure:16978: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+ if test $ac_cv_c_const = no; then
+ 
+@@ -15464,13 +16985,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15467: checking for off_t" >&5
++echo "configure:16988: checking for off_t" >&5
+ echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+ if test "${ac_cv_type_off_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15473 "configure"
++#line 16994 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15485,25 +17006,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15488: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15491: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15493: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15496: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17009: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_off_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_off_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_off_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15506: result: $ac_cv_type_off_t" >&5
++echo "configure:17018: result: $ac_cv_type_off_t" >&5
+ echo "${ECHO_T}$ac_cv_type_off_t" >&6
+ if test $ac_cv_type_off_t = yes; then
+   :
+@@ -15515,13 +17027,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15518: checking for size_t" >&5
++echo "configure:17030: checking for size_t" >&5
+ echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+ if test "${ac_cv_type_size_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15524 "configure"
++#line 17036 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15536,25 +17048,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15539: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15542: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15544: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15547: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17051: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_size_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_size_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15557: result: $ac_cv_type_size_t" >&5
++echo "configure:17060: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+ if test $ac_cv_type_size_t = yes; then
+   :
+@@ -15566,13 +17069,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15569: checking for ssize_t" >&5
++echo "configure:17072: checking for ssize_t" >&5
+ echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+ if test "${ac_cv_type_ssize_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15575 "configure"
++#line 17078 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -15590,7 +17093,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:15593: result: $ac_cv_type_ssize_t" >&5
++echo "configure:17096: result: $ac_cv_type_ssize_t" >&5
+ echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+ if test $ac_cv_type_ssize_t = no; then
+ 
+@@ -15600,13 +17103,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15603: checking for pid_t" >&5
++echo "configure:17106: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15609 "configure"
++#line 17112 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15621,25 +17124,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15624: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15627: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15629: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15632: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17127: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_pid_t=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_pid_t=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_pid_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15642: result: $ac_cv_type_pid_t" >&5
++echo "configure:17136: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+   :
+@@ -15651,13 +17145,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15654: checking for uid_t in sys/types.h" >&5
++echo "configure:17148: checking for uid_t in sys/types.h" >&5
+ echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
+ if test "${ac_cv_type_uid_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15660 "configure"
++#line 17154 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ 
+@@ -15671,7 +17165,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:15674: result: $ac_cv_type_uid_t" >&5
++echo "configure:17168: result: $ac_cv_type_uid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+ if test $ac_cv_type_uid_t = no; then
+ 
+@@ -15685,13 +17179,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15688: checking for mode_t" >&5
++echo "configure:17182: checking for mode_t" >&5
+ echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
+ if test "${ac_cv_type_mode_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15694 "configure"
++#line 17188 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -15709,7 +17203,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:15712: result: $ac_cv_type_mode_t" >&5
++echo "configure:17206: result: $ac_cv_type_mode_t" >&5
+ echo "${ECHO_T}$ac_cv_type_mode_t" >&6
+ if test $ac_cv_type_mode_t = no; then
+ 
+@@ -15719,13 +17213,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15722: checking for sig_atomic_t" >&5
++echo "configure:17216: checking for sig_atomic_t" >&5
+ echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6
+ if test "${ac_cv_type_sig_atomic_t+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15728 "configure"
++#line 17222 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -15743,7 +17237,7 @@
+ rm -f conftest*
+ 
+ fi
+-echo "$as_me:15746: result: $ac_cv_type_sig_atomic_t" >&5
++echo "configure:17240: result: $ac_cv_type_sig_atomic_t" >&5
+ echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6
+ if test $ac_cv_type_sig_atomic_t = no; then
+ 
+@@ -15754,13 +17248,13 @@
+ fi
+ 
+ cv=`echo "long long" | sed 'y%./+- %__p__%'`
+-echo "$as_me:15757: checking for long long" >&5
++echo "configure:17251: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_type_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15763 "configure"
++#line 17257 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -15777,37 +17271,28 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15780: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15783: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15785: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15788: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17274: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   eval "ac_cv_type_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "ac_cv_type_$cv=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "ac_cv_type_$cv=no"
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+ ac_foo=`eval echo \\$ac_cv_type_$cv`
+-echo "$as_me:15799: result: $ac_foo" >&5
++echo "configure:17284: result: $ac_foo" >&5
+ echo "${ECHO_T}$ac_foo" >&6
+ if test "$ac_foo" = yes; then
+   ac_tr_hdr=HAVE_`echo long long | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+ if false; then
+-	echo "$as_me:15804: checking for long long" >&5
++	echo "configure:17289: checking for long long" >&5
+ echo $ECHO_N "checking for long long... $ECHO_C" >&6
+ if test "${ac_cv_type_long_long+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15810 "configure"
++#line 17295 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15822,25 +17307,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15825: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15828: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15830: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15833: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17310: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_type_long_long=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_type_long_long=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_type_long_long=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15843: result: $ac_cv_type_long_long" >&5
++echo "configure:17319: result: $ac_cv_type_long_long" >&5
+ echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+ 
+@@ -15858,13 +17334,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15861: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:17337: checking whether time.h and sys/time.h may both be included" >&5
+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
+ if test "${ac_cv_header_time+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15867 "configure"
++#line 17343 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -15879,25 +17355,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15882: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15885: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15887: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15890: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17358: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_header_time=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_header_time=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_header_time=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15900: result: $ac_cv_header_time" >&5
++echo "configure:17367: result: $ac_cv_header_time" >&5
+ echo "${ECHO_T}$ac_cv_header_time" >&6
+ if test $ac_cv_header_time = yes; then
+ 
+@@ -15907,13 +17374,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15910: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:17377: checking whether struct tm is in sys/time.h or time.h" >&5
+ echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
+ if test "${ac_cv_struct_tm+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15916 "configure"
++#line 17383 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -15927,25 +17394,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15930: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15933: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:15935: \"test -s conftest.$ac_objext\"") >&5
+-  (eval test -s conftest.$ac_objext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:15938: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17397: \"$ac_compile\") >&5; (eval $ac_compile) 2>&5; } && test -s conftest.$ac_objext; then
+   ac_cv_struct_tm=time.h
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_struct_tm=sys/time.h
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_struct_tm=sys/time.h
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15948: result: $ac_cv_struct_tm" >&5
++echo "configure:17406: result: $ac_cv_struct_tm" >&5
+ echo "${ECHO_T}$ac_cv_struct_tm" >&6
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+@@ -15955,13 +17413,13 @@
+ 
+ fi
+ 
+-echo "$as_me:15958: checking for ANSI C header files" >&5
++echo "configure:17416: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+ if test "${ac_cv_header_stdc+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 15964 "configure"
++#line 17422 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -15969,15 +17427,9 @@
+ #include <float.h>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:15972: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:15978: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:17431: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -15985,19 +17437,21 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16000 "configure"
++#line 17454 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ 
+@@ -16015,7 +17469,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16018 "configure"
++#line 17472 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ 
+@@ -16036,7 +17490,7 @@
+   :
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16039 "configure"
++#line 17493 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #if ((' ' & 0x0FF) == 0x020)
+@@ -16062,27 +17516,20 @@
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16065: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16068: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { (eval echo "$as_me:16069: \"./conftest$ac_exeext\"") >&5
+-  (eval ./conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16072: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:17519: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } &&
++   test -s conftest$ac_exeext && (./conftest$ac_exeext; exit) 2>/dev/null; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_header_stdc=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_header_stdc=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
++
+ fi
+ fi
+-echo "$as_me:16085: result: $ac_cv_header_stdc" >&5
++echo "configure:17532: result: $ac_cv_header_stdc" >&5
+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
+ if test $ac_cv_header_stdc = yes; then
+ 
+@@ -16124,6 +17571,7 @@
+ 	netinet/in_systm.h			\
+ 	netinet6/in6.h				\
+ 	netinfo/ni.h				\
++	openssl/crypto.h			\
+ 	paths.h					\
+ 	pthread.h				\
+ 	pty.h					\
+@@ -16185,25 +17633,21 @@
+ 
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:16188: checking for $ac_header" >&5
++
++echo "configure:17637: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16194 "configure"
++#line 17643 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:16198: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:16204: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:17649: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -16211,16 +17655,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:16223: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:17670: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -16233,25 +17680,21 @@
+ for ac_header in standards.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:16236: checking for $ac_header" >&5
++
++echo "configure:17684: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16242 "configure"
++#line 17690 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:16246: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:16252: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:17696: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -16259,16 +17702,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:16271: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:17717: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -16282,13 +17728,13 @@
+ 
+ cv=`echo "$i" | sed 'y%./+-%__p_%'`
+ 
+-echo "$as_me:16285: checking for $i" >&5
++echo "configure:17731: checking for $i" >&5
+ echo $ECHO_N "checking for $i... $ECHO_C" >&6
+ if eval "test \"\${ac_cv_header_$cv+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16291 "configure"
++#line 17737 "configure"
+ #include "confdefs.h"
+ \
+ #ifdef HAVE_STANDARDS_H
+@@ -16297,15 +17743,9 @@
+ #include <$i>
+ 
+ _ACEOF
+-if { (eval echo "$as_me:16300: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:16306: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:17747: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -16313,16 +17753,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "ac_cv_header_$cv=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "ac_cv_header_$cv=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:16325: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
++echo "configure:17768: result: `eval echo '${'ac_cv_header_$cv'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'ac_cv_header_$cv'}'`" >&6
+ ac_res=`eval echo \\$ac_cv_header_$cv`
+ if test "$ac_res" = yes; then
+@@ -16334,29 +17777,26 @@
+ fi
+ done
+ if false;then
++	
+ 
+ for ac_header in netinet/ip.h netinet/tcp.h
+ do
+ ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
+-echo "$as_me:16341: checking for $ac_header" >&5
++
++echo "configure:17786: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16347 "configure"
++#line 17792 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
++
+ _ACEOF
+-if { (eval echo "$as_me:16351: \"$ac_cpp conftest.$ac_ext >/dev/null\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext >/dev/null) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:16357: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  if test -s conftest.err; then
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.err"
++if { (eval echo configure:17798: \"$ac_try\") >&5; (eval $ac_try) 2>&5; }; then
++  if egrep -v '^ *\+' conftest.err | grep . >/dev/null; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
+   else
+     ac_cpp_err=
+@@ -16364,16 +17804,19 @@
+ else
+   ac_cpp_err=yes
+ fi
++
+ if test -z "$ac_cpp_err"; then
+   eval "$ac_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  cat conftest.err >&5
++  echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   eval "$ac_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest*
++
+ fi
+-echo "$as_me:16376: result: `eval echo '${'$ac_ac_Header'}'`" >&5
++echo "configure:17819: result: `eval echo '${'$ac_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
+ if test `eval echo '${'$ac_ac_Header'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -16429,13 +17872,13 @@
+   v6type=unknown
+ v6lib=none
+ 
+-echo "$as_me:16432: checking ipv6 stack type" >&5
++echo "configure:17875: checking ipv6 stack type" >&5
+ echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
+ for i in v6d toshiba kame inria zeta linux; do
+ 	case $i in
+ 	v6d)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16438 "configure"
++#line 17881 "configure"
+ #include "confdefs.h"
+ 
+ #include </usr/local/v6/include/sys/types.h>
+@@ -16454,7 +17897,7 @@
+ 		;;
+ 	toshiba)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16457 "configure"
++#line 17900 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/param.h>
+@@ -16473,7 +17916,7 @@
+ 		;;
+ 	kame)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16476 "configure"
++#line 17919 "configure"
+ #include "confdefs.h"
+ 
+ #include <netinet/in.h>
+@@ -16492,7 +17935,7 @@
+ 		;;
+ 	inria)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16495 "configure"
++#line 17938 "configure"
+ #include "confdefs.h"
+ 
+ #include <netinet/in.h>
+@@ -16509,7 +17952,7 @@
+ 		;;
+ 	zeta)
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16512 "configure"
++#line 17955 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/param.h>
+@@ -16539,7 +17982,7 @@
+ 		break
+ 	fi
+ done
+-echo "$as_me:16542: result: $v6type" >&5
++echo "configure:17985: result: $v6type" >&5
+ echo "${ECHO_T}$v6type" >&6
+ 
+ if test "$v6lib" != "none"; then
+@@ -16551,7 +17994,7 @@
+ 	done
+ fi
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16554 "configure"
++#line 17997 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_TYPES_H
+@@ -16586,28 +18029,19 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16589: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16592: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:16594: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16597: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:18032: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   ac_cv_lib_ipv6=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-ac_cv_lib_ipv6=no
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_lib_ipv6=no
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+-echo "$as_me:16608: checking for IPv6" >&5
++echo "configure:18042: checking for IPv6" >&5
+ echo $ECHO_N "checking for IPv6... $ECHO_C" >&6
+-echo "$as_me:16610: result: $ac_cv_lib_ipv6" >&5
++echo "configure:18044: result: $ac_cv_lib_ipv6" >&5
+ echo "${ECHO_T}$ac_cv_lib_ipv6" >&6
+ if test "$ac_cv_lib_ipv6" = yes; then
+ 
+@@ -16617,7 +18051,7 @@
+ 
+ fi
+ 
+-echo "$as_me:16620: checking for socket" >&5
++echo "configure:18054: checking for socket" >&5
+ echo $ECHO_N "checking for socket... $ECHO_C" >&6
+ if test "${ac_cv_funclib_socket+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16633,7 +18067,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16636 "configure"
++#line 18070 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16645,20 +18079,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16648: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16651: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:16653: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16656: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:18082: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_socket=$ac_lib; else ac_cv_funclib_socket=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -16671,17 +18096,17 @@
+ eval "ac_res=\$ac_cv_funclib_socket"
+ 
+ if false; then
+-
++	
+ for ac_func in socket
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:16678: checking for $ac_func" >&5
++echo "configure:18103: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16684 "configure"
++#line 18109 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -16712,25 +18137,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16715: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16718: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:16720: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16723: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:18140: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "$ac_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-eval "$ac_ac_var=no"
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  eval "$ac_ac_var=no"
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16733: result: `eval echo '${'$ac_ac_var'}'`" >&5
++echo "configure:18149: result: `eval echo '${'$ac_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
+ if test `eval echo '${'$ac_ac_var'}'` = yes; then
+   cat >>confdefs.h <<EOF
+@@ -16754,13 +18170,13 @@
+ #define $ac_tr_func 1
+ EOF
+ 
+-	echo "$as_me:16757: result: yes" >&5
++	echo "configure:18173: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 	;;
+ 	no)
+ 	eval "ac_cv_func_socket=no"
+ 	eval "LIB_socket="
+-	echo "$as_me:16763: result: no" >&5
++	echo "configure:18179: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ 	;;
+ 	*)
+@@ -16774,7 +18190,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-	echo "$as_me:16777: result: yes, in $ac_res" >&5
++	echo "configure:18193: result: yes, in $ac_res" >&5
+ echo "${ECHO_T}yes, in $ac_res" >&6
+ 	;;
+ esac
+@@ -16783,7 +18199,7 @@
+ 	LIBS="$LIB_socket $LIBS"
+ fi
+ 
+-echo "$as_me:16786: checking for gethostbyname" >&5
++echo "configure:18202: checking for gethostbyname" >&5
+ echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+ if test "${ac_cv_funclib_gethostbyname+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16799,7 +18215,7 @@
+ 		fi
+ 		LIBS=" $ac_lib  $ac_save_LIBS"
+ 		cat >conftest.$ac_ext <<_ACEOF
+-#line 16802 "configure"
++#line 18218 "configure"
+ #include "confdefs.h"
+ 
+ int
+@@ -16811,20 +18227,11 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16814: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16817: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:16819: \"test -s conftest$ac_exeext\"") >&5
+-  (eval test -s conftest$ac_exeext) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16822: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++if { (eval echo configure:18230: \"$ac_link\") >&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
+   eval "if test -n \"$ac_lib\";then ac_cv_funclib_gethostbyname=$ac_lib; else ac_cv_funclib_gethostbyname=yes; fi";break
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest$ac_exeext conftest.$ac_ext
+ 	done
+@@ -16837,17 +18244,17 @@
+ eval "ac_res=\$ac_cv_funclib_gethostbyname"
+ 
+ if false; then
+-
++	
+ for ac_func in gethostbyname
+ do
+ ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
+-echo "$as_me:16844: checking for $ac_func" >&5
++echo "configure:18251: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$ac_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line 16850 "configure"
++#line 18257 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func (); below.  */
+@@ -16878,25 +18285,16 @@
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16881: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:16884: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { (eval echo "$as_me:16886